diff --git a/README.md b/README.md
index aeacd3f..10313ad 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ where just before executing the statement the ``%%EIO_LAST_POLL%%`` will be repl
 
 You may use this action to do the operations that are not producing output rows but do the database manipulations, 
 e.g. ``INSERT``, ``UPDATE`` or ``DELETE`` statements. Internally we use prepared statements, so all incoming data is
-validated against SQL injetion, however we had to build a connection from JavaSscript types to the MSSQL data types
+validated against SQL injetion, however we had to build a connection from JavaScript types to the MSSQL data types
 therefore when doing a prepared statements you would need to add ``:type`` to **each prepared statement variable**.
 
 For example if you have a following SQL statement:
diff --git a/component.json b/component.json
index 63d695a..fac3185 100644
--- a/component.json
+++ b/component.json
@@ -10,44 +10,19 @@
         "viewClass": "TextFieldView",
         "placeholder": "localhost",
         "help": {
-          "description": "Server to connect to. You can use 'host\\\\instance' to connect to named instance."
+          "description": "Server to connect. You can use 'host\\\\instance' to connect to named instance."
         }
       },
-      "port": {
-        "label": "Port",
-        "required": false,
-        "viewClass": "TextFieldView",
-        "placeholder": "1433",
-        "help": {
-          "description": "Port to connect to. If not provided default port 1433 is used. Don't set when connecting to named instance."
-        }
-      },
-      "database": {
+        "database": {
         "label": "Database Name",
         "required": true,
         "viewClass": "TextFieldView",
         "placeholder": "database",
         "help": {
-          "description": "Database to connect to. Default is dependent on server configuration."
-        }
-      },
-      "encrypt": {
-        "label": "Encrypt",
-        "viewClass": "CheckBoxView",
-        "help": {
-          "description": "Enable this option if you're using Windows Azure"
+          "description": "Database to connect. Default is dependent on server configuration."
         }
       },
-      "domain": {
-        "label": "Domain",
-        "required": false,
-        "viewClass": "TextFieldView",
-        "placeholder": "domain",
-        "help": {
-          "description": "If domain is provided, the connection to SQL Server will be done using domain login."
-        }
-      },
-      "username": {
+        "username": {
         "label": "Username",
         "required": true,
         "viewClass": "TextFieldView",
@@ -64,6 +39,31 @@
         "help": {
           "description": "Password to use for authentication with the database."
         }
+      },
+      "port": {
+        "label": "Port",
+        "required": false,
+        "viewClass": "TextFieldView",
+        "placeholder": "1433",
+        "help": {
+          "description": "Port to connect. If not provided default port 1433 is used. Don't set when connecting to named instance."
+        }
+      },
+      "domain": {
+        "label": "Domain",
+        "required": false,
+        "viewClass": "TextFieldView",
+        "placeholder": "domain",
+        "help": {
+          "description": "If domain is provided, the connection to SQL Server will be done using domain login."
+        }
+      },
+      "encrypt": {
+        "label": "Encrypt",
+        "viewClass": "CheckBoxView",
+        "help": {
+          "description": "Enable this option if you're using Windows Azure"
+        }
       }
     }
   },
@@ -82,7 +82,7 @@
           "viewClass": "TextAreaWithNoteView",
           "placeholder": "INSERT INTO films (code,title,kind) VALUES (@code:number,@title:string,@kind:string)",
           "help": {
-            "description": "SQL query to execute. You can use parameters of message body as <i>@value:number</i> and type is <i>:type</i>"
+            "description": "SQL query to execute. You can use parameters of message body as '@value:number' and type is ':type'"
           }
         }
       },
@@ -101,9 +101,9 @@
           "properties": {
             "query": {
               "type": "string",
-              "title": "SQL Query",
+              "title": "SQL SELECT Statement",
               "required": true,
-              "description": "SQL query to execute."
+              "description": "Executes a SELECT statement that fetches potentially multiple database rows from the database"
             }
           }
         }
@@ -112,7 +112,7 @@
   },
   "triggers": {
     "selectTrigger": {
-      "title": "SELECT",
+      "title": "SQL SELECT Statement",
       "main": "./lib/actions/select.js",
       "type": "polling",
       "help": {
@@ -121,12 +121,12 @@
       },
       "fields": {
         "query": {
-          "label": "SQL Query",
+          "label": "SQL SELECT Statement",
           "required": true,
           "viewClass": "TextAreaWithNoteView",
-          "placeholder": "INSERT INTO films (code,title,kind) VALUES (@code:number,@title:string,@kind:string)",
+          "placeholder": "SELECT * FROM Employee WHERE EmpID = 322",
           "help": {
-            "description": "SQL query to execute. You can use parameters of message body as <i>@value:number</i> and type is <i>:type</i>"
+            "description": "SQL SELECT Statement to execute"
           }
         }
       },