diff --git a/source/_components/light.hyperion.markdown b/source/_components/light.hyperion.markdown
new file mode 100644
index 00000000000..b7241f709f6
--- /dev/null
+++ b/source/_components/light.hyperion.markdown
@@ -0,0 +1,22 @@
+---
+layout: component
+title: Hyperion
+description: "Instructions how to integrate Hyperion into Home Assistant."
+date: 2015-10-25 22:43
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_category: Light
+---
+
+This platform allows you to integrate your Hyperion into Home Assistant.
+
+```yaml
+# Example configuration.yaml entry
+light:
+  platform: hyperion
+  host: 192.168.1.98
+  # Optional
+  port: 19444
+```
diff --git a/source/_components/script.markdown b/source/_components/script.markdown
index 7458b5eb087..205098fcb86 100644
--- a/source/_components/script.markdown
+++ b/source/_components/script.markdown
@@ -29,13 +29,13 @@ script:
           domain: light
       - alias: Bedroom lights on
         service: light.turn_on
-        data:
+        service_data:
           entity_id: group.bedroom
       - delay:
           # supports seconds, milliseconds, minutes, hours, etc.
           minutes: 1
       - alias: Living room lights on
         service: light.turn_on
-        data:
+        service_data:
           entity_id: group.living_room
 ```
diff --git a/source/_components/shell_command.markdown b/source/_components/shell_command.markdown
index 76da82a5d9f..dec04c801ca 100644
--- a/source/_components/shell_command.markdown
+++ b/source/_components/shell_command.markdown
@@ -11,15 +11,17 @@ ha_category: Automation
 ---
 
 
-This component can expose regular shell commands as services.
+This component can expose regular shell commands as services. Services can be called from a script
+or in automation.
 
 ```yaml
 # Example configuration.yaml entry
+# Exposes service shell_command.restart_pow
 shell_command:
   restart_pow: touch ~/.pow/restart.txt
 ```
 
 Configuration variables:
 
-- Alias for the command and the command itself.
-
+ - Alias for the command
+ - Command itself.