diff --git a/.gitignore b/.gitignore
index 806d27a..b69b6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ src/main/resources-generated
 classes/
 
 .bundle/
-contrib/cloudformation-template/bin/
\ No newline at end of file
+contrib/cloudformation-template/bin/
+
+.DS_Store
\ No newline at end of file
diff --git a/README.md b/README.md
index 3f3918b..a1ef68e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The settings allow you to choose the AMI to be used for the EC2 instance, the in
 
 Once the builds finish and the EC2 instances are idle for a while, they will be automatically scaled down and destroyed, removing the cost of running idle EC2 instances. Along with saving cost, this enables a flexible and dynamic build grid in which you don’t need to worry about configuration drift.
 
-The set of images [here](docs/plugin_as_images.md) explain this concept as well
+The set of images [here](docs/plugin_as_images.md) explain this concept as well.
 
 Table of Contents
 =================
diff --git a/docs/cluster_profile_configuration.md b/docs/cluster_profile_configuration.md
index a7b6a59..b0bb1b8 100644
--- a/docs/cluster_profile_configuration.md
+++ b/docs/cluster_profile_configuration.md
@@ -1,7 +1,7 @@
 # Configure cluster profile
 
-* Navigate to **_Admin > Elastic Profiles_** in the main menu.
-* Click the **_Add Cluster Profile_** button to create a new cluster profile.
+* Navigate to **_Admin > Elastic Agent Configurations_** in the main menu.
+* Click the **_Add_** button to create a new cluster profile.
 * Select `GoCD Elastic Agent Plugin for Amazon ECS` value for plugin Id.   
 
 ![Alt text](images/cluster-profiles/new_cluster_profile_button.png "Admin Dropdown")
@@ -14,26 +14,26 @@
 
 ![Alt text](images/cluster-profiles/initial_cluster_configuration.png "Elastic container configuration")
  
-1. **Cluster Id\*:** UUID of the newly defined cluster profile. 
+1. **Cluster Profile Name (mandatory):** Identifier for the newly defined cluster profile. 
 
-2. **GoCD Server URL\*:** This is used by container to register with GoCD server. Server hostname must resolve in your container. Don't use `localhost`.
+2. **GoCD Server URL (mandatory)*:** This is used by container to register with GoCD server. Server hostname must resolve from within your container. Don't use `localhost`.
 
-3. **Container auto register time-out\*:** If an agent running on a container created by this plugin does not register with this server within the specified timeout period (specified in minutes), the plugin will assume that the container failed to startup and will be terminated.
+3. **Container auto-register timeout in minutes (mandatory):** If an agent running on a container created by this plugin does not register with this server within the specified timeout period (specified in minutes), the plugin will assume that the container failed to startup and will terminate it.
 
-## Advance Container Configuration
+## Advanced Container Configuration
 
 ![Alt text](images/cluster-profiles/advance_container_configuration.png "Elastic container configuration")
 
-3. **Environment Variables:** These variables will be passed onto the container when it is started up. Read more about [ENV](https://docs.docker.com/engine/reference/builder/#env).
+1. **Environment Variables:** These variables will be passed onto the container when it is started up. Read more about [docker's ENV](https://docs.docker.com/engine/reference/builder/#env).
    
-    For example
+    For example:
   
     ```text
     TZ=PST
     JAVA_HOME=/opt/java
     ```
 
-4. **Container data volume size:** Maximum volume size in GB that container can use to store container data. Defaults to `10G`.
+2. **Container data volume size:** Maximum volume size in GB that container can use to store container data. Defaults to `10G`.
 
 ## AWS Credentials
 
@@ -41,7 +41,7 @@ Optionally, specify `Access Key` and `Secret Access Key` of AWS account. These a
 
 ![Alt text](images/cluster-profiles/aws_credentials.png "AWS Credentials")
 
-If not specified, plugin will try to detect it in following order:
+If not specified, the plugin will try to detect it in following order:
 
 1. **Environment Variables -** `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` (RECOMMENDED since they are recognized by all the AWS SDKs and CLI except for .NET), or `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` (only recognized by Java SDK)
 
@@ -49,53 +49,53 @@ If not specified, plugin will try to detect it in following order:
 
 3. **Instance profile -** Instance profile credentials delivered through the Amazon EC2 metadata service
 
-Read more about API keys [here](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys).  
+Read more about AWS' access keys [here](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys).  
 
 ## EC2 instance settings
 
-These settings are applied to all ec2 instances launched by plugin irrespective of platform.
+These settings are applied to all EC2 instances launched by the plugin irrespective of platform.
 
 ![Alt text](images/cluster-profiles/ec2_instance_settings.png "EC2 instance settings")
 
-1. **AWS keypair name:** The name of the key pair that you may use to SSH or RDP into the EC2 instance. User can override this from elastic profile. Read more about [Key Pairs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html)
+1. **AWS keypair name:** The name of the key pair that you may use to SSH or RDP into the EC2 instance. This can be overridden from the elastic profile. Read more about [AWS EC2 Key Pairs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html).
 
-2. **Subnet id(s):** Enter comma separated subnet ids. If multiple subnet ids are specified, the subnet having the least number of EC2 instances will be used to spin up a new EC2 instance. If left unspecified or the specified subnet ids are not available at the time of launching the EC2 instance, AWS will choose a default subnet from your default VPC for you. User can override this from elastic profile. Read more about [VPCs & Subnets](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html)  
+2. **Subnet id(s):** Enter comma separated subnet ids. If multiple subnet ids are specified, the subnet having the least number of EC2 instances will be used to spin up a new EC2 instance. If left unspecified or the specified subnet ids are not available at the time of launching the EC2 instance, AWS will choose a default subnet from your default VPC for you. User can override this from elastic profile. Read more about [VPCs & Subnets](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html).
 
-3. **Security Group Id(s):**  Enter comma separated security group ids. EC2 instances will be assigned the security groups(s) specified here. User can override this from elastic profile. Read more about [SecurityGroup](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html)
+3. **Security Group Id(s):**  Enter comma separated security group ids. EC2 instances will be assigned the security groups(s) specified here. This can be overridden from the elastic profile. Read more about [AWS' VPC Security Groups](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html).
 
-4. **IAM profile for EC2 instance\*:** The name of the IAM profile that will allow the ECS agent to make API calls to AWS on your behalf. Please refer [pre-requisites](../prerequisites/) for the bare minimum privileges your profile must have to allow plugin to make API calls. User can override this from elastic profile.
+4. **IAM instance profile (mandatory):** The name of the IAM profile that will allow the ECS agent to make API calls to AWS on your behalf. Please refer [pre-requisites](../prerequisites/) for the bare minimum privileges your profile must have to allow plugin to make API calls. This can be overridden from the elastic profile.
 
 ## EC2 instance settings for Linux
 
-This is to configure linux specific defaults for EC2 instance. It will be used to launch new EC2 instance. However, user can override few of the defaults from an elastic profile.
+This is to configure Linux specific defaults for EC2 instance. It will be used to launch new EC2 instances. However, a few of these defaults can be overridden from elastic profiles.
 
 ![Alt text](images/cluster-profiles/linux_instance_settings.png "EC2 instance settings for Linux")
                                      
-1. **AMI ID:** The AMI ID that will be used when an instance is spun up. The ECS agent will run on this ECS optimized EC2 instance. We recommend using an [Amazon ECS-Optimized AMI](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html). ECS optimized Linux AMIs are available [here](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html). User can override this from elastic profile.
+1. **AMI ID:** The AMI ID that will be used when an instance is spun up. The ECS agent will run on this ECS optimized EC2 instance. We recommend using an [Amazon ECS-Optimized AMI](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html). ECS optimized Linux AMIs are available [here](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html). This can be overridden from elastic profiles.
 
-2. **Instance type:** This instance type will be used to spin up EC2 instances that will run docker containers with this profile. Read more about [Instance Type](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html)
+2. **Instance type:** This instance type will be used to spin up EC2 instances that will run docker containers with this profile. Read more about [EC2 Instance Types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html).
                        
-3. **Operating system volume type:** Allows to override default operating system volume. This is used to store operating system and container volumes. It will get deleted on instance termination. Defaults to `8G`. User may have to increase size of the volume if containers are generating too much persistent data. See [docker volumes](https://docs.docker.com/storage/volumes/) for more information.
+3. **Operating system volume type:** Allows to override default operating system volume used by docker. This is used to store operating system and container volumes. It will get deleted on EC2 instance termination. Defaults to `8G`. Users may have to increase the size of this volume if containers generate too much persistent data. See [docker volumes](https://docs.docker.com/storage/volumes/) for more information.
 
-4. **Docker Volume type:** Allows to override default storage with specified type and size. This is used to store docker images and metadata. It will get deleted on ec2 instance termination. Defaults to `22G`. User may have to increase size of th`e volume if docker images size is too big to fit in 22G of default volume. See [docker storage](https://docs.docker.com/storage/storagedriver/) for more information.
+4. **Docker Volume type:** Allows to override default docker storage with specified type and size. This is used to store docker images and metadata. It will get deleted on EC2 instance termination. Defaults to `22G`. Users may have to increase the size of this volume if docker images are too big to fit in 22G of the default volume. See [docker storage](https://docs.docker.com/storage/storagedriver/) for more information.
 
-5. **Instance creation timeout:** If an EC2 instance created by this plugin does not register with the container service within this timeout period, the plugin will assume that the instance has failed to startup and will be terminated. Defaults to `5 minutes`.  
+5. **Instance creation timeout:** If an EC2 instance created by this plugin does not register with the container service within this timeout period, the plugin will assume that the instance has failed to startup and will be terminated. Defaults to `5` minutes.
 
-6. **Minimum instance required in cluster:** Minimum linux instances you'd like to have running at any point of time. Defaults to `0`.
+6. **Minimum instance required in cluster:** Minimum Linux instances you'd like to have running at any point of time. Defaults to `0`.
 
-7. **Maximum instances allowed:** Restricts maximum number of linux instances in the cluster. Plugin will not launch new linux instance if the cluster is already running specified number of instances. Defaults to `5`.
+7. **Maximum instances allowed:** Restricts maximum number of Linux instances in the cluster. Plugin will not launch a new Linux instance if the cluster is already running the specified number of instances. Defaults to `5`.
 
-8. **Instance stop policy\*:** Plugin will stop ec2 instances in the ECS cluster based on specified stop policy.
-    - **Stop Idle Instance:** Plugin stops the instance which is idle for more than the specified idle timeout. Defaults to `10 minutes`.
+8. **Instance stop policy (mandatory):** When there are no jobs to run and instances are idle, the plugin will stop EC2 instances in the ECS cluster based on the specified stop policy.
+    - **Stop Idle Instance:** Plugin stops the instance which is idle for more than the specified idle timeout. Defaults to `10` minutes.
     - **Stop Oldest Instance:** Plugin stops the oldest instance in the group. This option is useful when you're upgrading the instances in the cluster to a new EC2 instance type, so you can gradually replace instances of the old type with instances of the new type.
 
-9. **Terminate stopped instance after\*:** The plugin terminates the instance which is in `stopped` state for more than specified period. Defaults to `5 minutes`.
+9. **Terminate stopped instance after (mandatory):** The plugin terminates instances which are in `stopped` state for more than the specified period. Defaults to `5` minutes.
     
 10. **Spot Instance Configuration**
-    - **Maximum Spot Instances Allowed in Cluster:** Restricts the maximum number of linux Spot Instances allowed in the cluster. Plugin will not launch new Spot Instance if the cluster is already running specified number of instances or has Spot Instance requests pending. Defaults to 10.
-    - **Terminate Idle Spot Instances after(in minutes):** The plugin terminates a Spot Instance which is idle for more than specified period. Defaults to `30 minutes`.
+    - **Maximum Spot Instances Allowed in Cluster:** Restricts the maximum number of Linux Spot Instances allowed in the cluster. Plugin will not launch a new Spot Instance if the cluster is already running the specified number of instances or has Spot Instance requests pending. Defaults to `10`.
+    - **Terminate Idle Spot Instances after (in minutes):** The plugin terminates a Spot Instance which is idle for more than the specified period. Defaults to `30` (minutes).
                                       
-11. **Userdata script:**  This allows user to execute command on startup of ec2 instance. Read more about [userdata script](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html).
+11. **Userdata script:**  This allows user to execute commands on startup of EC2 instances. Read more about [ECS userdata scripts](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html).
                          
     For example
     
@@ -106,33 +106,33 @@ This is to configure linux specific defaults for EC2 instance. It will be used t
 
 ## EC2 instance settings for Windows
 
-This is to configure windows specific defaults for EC2 instance. It will be used to launch new EC2 instance. However, user can override few of the defaults from an elastic profile.
+This is to configure Windows specific defaults for EC2 instance. It will be used to launch new EC2 instances. However, few of the defaults can be overridden from elastic profiles.
 
 ![Alt text](images/cluster-profiles/windows_instance_settings.png "EC2 instance settings for Windows")
                                      
-1. **AMI ID:** The AMI ID that will be used when an instance is spun up. The ECS agent will run on this ECS optimized EC2 instance. We recommend using an [Amazon ECS-Optimized AMI](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html). ECS optimized Windows AMIs are available [here](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows_getting_started.html#launch_windows_container_instance). User can override this from elastic profile.
+1. **AMI ID:** The AMI ID that will be used when an instance is spun up. The ECS agent will run on this ECS optimized EC2 instance. We recommend using an [Amazon ECS-Optimized AMI](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html). ECS optimized Windows AMIs are available [here](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows_getting_started.html#launch_windows_container_instance). This can be overridden from elastic profiles.
 
-2. **Instance type:** This instance type will be used to spin up EC2 instances that will run docker containers with this profile. Read more about [Instance Type](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html)
+2. **Instance type:** This instance type will be used to spin up EC2 instances that will run docker containers with this profile. Read more about [ECS Instance Types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html).
                        
-3. **Operating system volume type:** Allows to override default operating system volume. This is used to store all persistent data including docker. It will get deleted on instance termination. Defaults to `50G`.  
+3. **Operating system volume type:** Allows to override default operating system volume used by docker. This is used to store all persistent data including docker volumes. It will get deleted on EC2 instance termination. Defaults to `50G`.
 
-5. **Instance creation timeout:** If an EC2 instance created by this plugin does not register with the container service within this timeout period, the plugin will assume that the instance has failed to startup and will be terminated. Defaults to `15 minutes`.  
+5. **Instance creation timeout:** If an EC2 instance created by this plugin does not register with the container service within this timeout period, the plugin will assume that the instance has failed to startup and will be terminated. Defaults to `15` minutes.
 
-6. **Minimum instance required in cluster:** Minimum linux instances you'd like to have running at any point of time. Defaults to `0`.
+6. **Minimum instance required in cluster:** Minimum Windows instances you'd like to have running at any point of time. Defaults to `0`.
 
-7. **Maximum instances allowed:** Restricts maximum number of linux instances in the cluster. Plugin will not launch new linux instance if the cluster is already running specified number of instances. Defaults to `5`.
+7. **Maximum instances allowed:** Restricts maximum number of Windows instances in the cluster. Plugin will not launch new Windows instance if the cluster is already running the specified number of instances. Defaults to `5`.
     
-8. **Instance stop policy\*:** Plugin will stop ec2 instances in the ECS cluster based on specified stop policy.
-    - **Stop Idle Instance:** Plugin stops the instance which is idle for more than the specified idle timeout. Defaults to `10 minutes`.
+8. **Instance stop policy (mandatory):** When there are no jobs to run and instances are idle, the plugin will stop EC2 instances in the ECS cluster based on the specified stop policy.
+    - **Stop Idle Instance:** Plugin stops the instance which is idle for more than the specified idle timeout. Defaults to `10` minutes.
     - **Stop Oldest Instance:** Plugin stops the oldest instance in the group. This option is useful when you're upgrading the instances in the cluster to a new EC2 instance type, so you can gradually replace instances of the old type with instances of the new type.
 
-9. **Terminate stopped instance after\*:** The plugin terminates the instance which is in `stopped` state for more than specified period. Defaults to `5 minutes`.
+9. **Terminate stopped instance after (mandatory):** The plugin terminates instances which are in `stopped` state for more than the specified period. Defaults to `5` (minutes).
                         
 10. **Spot Instance Configuration**
-    - **Maximum Spot Instances Allowed in Cluster:** Restricts the maximum number of linux Spot Instances allowed in the cluster. Plugin will not launch new Spot Instance if the cluster is already running specified number of instances or has Spot Instance requests pending. Defaults to 10.
-    - **Terminate Idle Spot Instances after(in minutes):** The plugin terminates a Spot Instance which is idle for more than specified period. Defaults to `30 minutes`.                              
+    - **Maximum Spot Instances Allowed in Cluster:** Restricts the maximum number of Windows Spot Instances allowed in the cluster. Plugin will not launch a new Spot Instance if the cluster is already running the specified number of instances or has Spot Instance requests pending. Defaults to `10`.
+    - **Terminate Idle Spot Instances after (in minutes):** The plugin terminates a Spot Instance which is idle for more than specified period. Defaults to `30` (minutes).
 
-11. **Userdata script:**  This allows user to execute powershell commands on startup of ec2 instance. Do not use `<powershell>` or `<script>` tags in script. Read more about [userdata script](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-windows-user-data.html).
+11. **Userdata script:**  This allows user to execute powershell commands on startup of EC2 instance. Do not use `<powershell>` or `<script>` tags in script. Read more about [EC2 userdata scripts](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-windows-user-data.html).
                          
     For example
     
@@ -145,7 +145,7 @@ This is to configure windows specific defaults for EC2 instance. It will be used
 
 ![Alt text](images/cluster-profiles/aws_cluster_configuration.png "AWS Cluster configuration")
 
-1. **AWS Cluster Name\*:** Name of the [ECS cluster](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_clusters.html) that will be managed by the plugin. This cluster must already exist.
+1. **AWS Cluster Name (mandatory):** Name of the [ECS cluster](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html) that will be managed by the plugin. This cluster must already exist.
 
 2. **AWS Region:** If you don't specify an [Availability Zone](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html), AWS will choose one for you.
 
@@ -154,11 +154,11 @@ This is to configure windows specific defaults for EC2 instance. It will be used
 
 ![Alt text](images/cluster-profiles/log_configuration.png "Log configuration")
 
-1. **Log driver name:** Read more about [enabling the awslogs](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_awslogs.html#enable_awslogs) on your Container Instances. Supported logging drivers are listed [here](https://docs.docker.com/engine/admin/logging/overview/#supported-logging-drivers).
+1. **Log driver name:** Read more about [enabling the awslogs Log Driver](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_awslogs.html#enable_awslogs) on your Container Instances. Supported logging drivers are listed [here](https://docs.docker.com/engine/admin/logging/overview/#supported-logging-drivers).
 
-2. **Log options:** Log options are used to filter log for the container instance. Enter one variable per line. Read more about [log options](https://docs.docker.com/config/containers/logging/awslogs/)
+2. **Log options:** Log options are used to control logs for the container instance. Enter one variable per line. Read more about [awslogs' log options](https://docs.docker.com/config/containers/logging/awslogs/).
     
-    For example
+    For example:
     
     ```
     awslogs-group=awslogs-mysql
@@ -167,35 +167,35 @@ This is to configure windows specific defaults for EC2 instance. It will be used
     
 ## Docker Registry
     
-This is to override default docker registry settings. Default registry is [hub.docker.com](https://hub.docker.com)
+This is to override default docker registry settings. Default registry is [hub.docker.com](https://hub.docker.com).
 
 ![Alt text](images/cluster-profiles/docker_registry.png "Docker registry configuration")
 
 ### Authenticate using auth token
     
-1. **Private docker registry url\*:** Specify docker registry URL here
-2. **Email\*:** Specify email of the user. This settings is already deprecated by docker. This may get removed in subsequent releases.
-3. **Docker registry auth token\*:** Authentication token for the user.
+1. **Private docker registry url (mandatory):** Specify docker registry URL here.
+2. **Email (mandatory):** Specify email of the user. This settings has been deprecated by docker. This may get removed in subsequent releases.
+3. **Docker registry auth token (mandatory):** Authentication token for the user.
 
 ### Authenticate using username and password
 
-1. **Private docker registry url\*:** Specify docker registry URL here
-2. **Email\*:** Specify email of the user. This settings is already deprecated by docker. This may get removed in subsequent releases.
-3. **Docker registry username\*:** Username of the private docker registry user. 
-4. **Docker registry password\*:** Password associated with the above specified user.
+1. **Private docker registry url (mandatory):** Specify docker registry URL here.
+2. **Email (mandatory):** Specify email of the user. This settings has been deprecated by docker. This may get removed in subsequent releases.
+3. **Docker registry username (mandatory):** Username of the private docker registry user. 
+4. **Docker registry password (mandatory):** Password associated with the above specified user.
 
 ## EFS 
 
 ![Alt text](images/cluster-profiles/efs.png "EFS configuration")
 
-**EFS IP address or DNS:** Plugin will use provided [EFS](https://docs.aws.amazon.com/efs/latest/ug/whatisefs.html) volume and mount it at /efs in ec2 instances and in docker containers. Multiple Amazon EC2 instances can access an Amazon EFS file system, so it can be used to store credentials for docker container.
+**EFS IP address or DNS:** Plugin will use provided [EFS](https://docs.aws.amazon.com/efs/latest/ug/whatisefs.html) volume and mount it at `/efs` in EC2 instances and in docker containers. Multiple Amazon EC2 instances can access an Amazon EFS file system, so it can be used to store credentials for docker containers (for instance).
 
-After configuring settings **save your changes**
+After configuring settings **save your changes**.
 
 <aside class="info">
     <strong>Note:</strong>
     <ol>
-        <li>EFS settings is supported only on <code>RPM</code> based linux operating system. This may get removed in subsequent releases.</li>
-        <li>Configuration marked with (*) are mandatory.</li>
+        <li>EFS settings are supported only on <code>RPM</code>-based linux operating system. This may get removed in subsequent releases.</li>
+        <li>Configuration settings marked with (*) are mandatory.</li>
     </ol>
 </aside>
diff --git a/docs/ecs_cloud_formation_template.json b/docs/ecs_cloud_formation_template.json
new file mode 100644
index 0000000..b90428b
--- /dev/null
+++ b/docs/ecs_cloud_formation_template.json
@@ -0,0 +1,177 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "ClusterName": {
+      "Description": "The name of the ECS cluster",
+      "Type": "String",
+      "Default": "GoCD"
+    }
+  },
+  "Outputs": {
+    "AccessKey": {
+      "Value": {
+        "Ref": "AccessKey"
+      }
+    },
+    "SecretKey": {
+      "Value": {
+        "Fn::GetAtt": [
+          "AccessKey",
+          "SecretAccessKey"
+        ]
+      }
+    },
+    "GoCDEC2OptimizedRole": {
+      "Value": {
+        "Fn::GetAtt": [
+          "GoCDEC2OptimizedRole",
+          "Arn"
+        ]
+      }
+    },
+    "GoCDEC2OptimizedInstanceProfile": {
+      "Value": {
+        "Fn::GetAtt": [
+          "GoCDEC2OptimizedInstanceProfile",
+          "Arn"
+        ]
+      }
+    }
+  },
+  "Resources": {
+    "GoCDECSCluster": {
+      "Type": "AWS::ECS::Cluster",
+      "Properties": {
+        "ClusterName": {
+          "Ref": "ClusterName"
+        }
+      }
+    },
+    "AccessKey": {
+      "Type": "AWS::IAM::AccessKey",
+      "Properties": {
+        "UserName": {
+          "Ref": "GoCDECSPluginUser"
+        }
+      }
+    },
+    "GoCDECSPluginUser": {
+      "Type": "AWS::IAM::User",
+      "Properties": {
+        "Policies": [
+          {
+            "PolicyName": "ManageEC2Instances",
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "ec2:runInstances",
+                    "ec2:createTags",
+                    "ec2:terminateInstances",
+                    "ec2:describeInstances",
+                    "ec2:describeSubnets",
+                    "ec2:createVolume",
+                    "ec2:attachVolume",
+                    "ec2:stopInstances",
+                    "ec2:startInstances",
+                    "ec2:deleteTags",
+                    "iam:PassRole",
+                    "iam:GetRole"
+                  ],
+                  "Resource": [
+                    "*"
+                  ]
+                }
+              ]
+            }
+          },
+          {
+            "PolicyName": "ManageECSInstances",
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "ecs:describeClusters",
+                    "ecs:deregisterContainerInstance",
+                    "ecs:describeContainerInstances",
+                    "ecs:listContainerInstances",
+                    "ecs:registerTaskDefinition",
+                    "ecs:deregisterTaskDefinition",
+                    "ecs:startTask",
+                    "ecs:stopTask",
+                    "ecs:listTasks",
+                    "ecs:describeTasks",
+                    "ecs:describeTaskDefinition"
+                  ],
+                  "Resource": [
+                    "*"
+                  ]
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "GoCDEC2OptimizedRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": {
+            "Effect": "Allow",
+            "Principal": {
+              "Service": [
+                "ec2.amazonaws.com"
+              ]
+            },
+            "Action": [
+              "sts:AssumeRole"
+            ]
+          }
+        },
+        "Policies": [
+          {
+            "PolicyName": "AllowECSAgentToManageContainers",
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "ecs:describeClusters",
+                    "ecs:discoverPollEndpoint",
+                    "ecs:registerContainerInstance",
+                    "ecs:deregisterContainerInstance",
+                    "ecs:poll",
+                    "ecs:startTelemetrySession",
+                    "ecs:submitContainerStateChange",
+                    "ecs:submitTaskStateChange",
+                    "logs:CreateLogStream",
+                    "logs:PutLogEvents"
+                  ],
+                  "Resource": [
+                    "*"
+                  ]
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "GoCDEC2OptimizedInstanceProfile": {
+      "Type": "AWS::IAM::InstanceProfile",
+      "Properties": {
+        "Roles": [
+          {
+            "Ref": "GoCDEC2OptimizedRole"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/docs/ecs_cloud_formation_template.json.erb b/docs/ecs_cloud_formation_template.json.erb
deleted file mode 100644
index fc54738..0000000
--- a/docs/ecs_cloud_formation_template.json.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%-
-  template = %x[bundle exec ruby #{File.dirname(__FILE__)}/ecs_cloud_formation_template.rb.txt expand]
-  raise 'Could not evaluate cloudformation template' unless $?.success?
--%>
-<%= template %>
\ No newline at end of file
diff --git a/docs/elastic_agent_images.md b/docs/elastic_agent_images.md
index 9c0a786..d3ee284 100644
--- a/docs/elastic_agent_images.md
+++ b/docs/elastic_agent_images.md
@@ -2,8 +2,8 @@
 
 GoCD elastic agents run inside Docker containers on an ECS cluster. You can either use the Docker images provided by the GoCD team or build your own images with the right software already provisioned on it.
 
-  * [Docker images provided by the GoCD team](https://hub.docker.com/u/gocd/) on Docker Hub
-  * Corresponding `Dockerfile` and init scripts of these docker images can be found [here](https://github.com/gocd?utf8=%E2%9C%93&q=docker-gocd-agent)
+  * [Docker images provided by the GoCD team](https://hub.docker.com/u/gocd/) on Docker Hub.
+  * Corresponding `Dockerfile` and init scripts of these docker images can be found [here](https://github.com/gocd?q=docker-gocd-agent).
 
 ## Using your own docker image with elastic agents
 
@@ -47,6 +47,6 @@ $properties = @("agent.auto.register.key=$env:GO_EA_AUTO_REGISTER_KEY",
 $properties | Out-File "c:\gocd-agent\config\autoregister.properties" -Encoding "default" -append
 ```
 
-**Note:** GoCD agent supports only `Little-endian` encoding. Please make sure that generated file has valid encoding.
+**Note:** GoCD agent supports only little-endian encoding. Please make sure that generated file has valid encoding.
 
-Refer to the bootstrap script template [here](https://github.com/gocd/gocd/blob/master/buildSrc/src/main/resources/gocd-docker-agent/docker-entrypoint.sh) to understand what is necessary for the image to be a GoCD agent docker image. To look for the bootstrap script for a particular container image of your choice, check one of the docker agent image repositories [here](https://github.com/gocd?utf8=%E2%9C%93&q=docker-gocd-agent).
+Refer to the bootstrap script template [here](https://github.com/gocd/gocd/blob/master/buildSrc/src/main/resources/gocd-docker-agent/docker-entrypoint.sh) to understand what is necessary for the image to be a GoCD agent docker image. To look for the bootstrap script for a particular container image of your choice, check one of the docker agent image repositories [here](https://github.com/gocd?q=docker-gocd-agent).
diff --git a/docs/elastic_profile_configuration.md b/docs/elastic_profile_configuration.md
index ff6bc41..8ae8685 100644
--- a/docs/elastic_profile_configuration.md
+++ b/docs/elastic_profile_configuration.md
@@ -1,65 +1,66 @@
 # Create an elastic agent profile for ECS
 
-The elastic agent profile apart from having docker container configurations, provides an ability to configure an EC2 Instance. This would be useful in cases where a docker container cannot be created on the EC2 Instance provisioned using configurations provided in the cluster profile.
+The elastic agent profile, apart from having docker container configurations, provides an ability to configure an EC2 Instance. This would be useful in cases where a docker container cannot be created on the EC2 Instance provisioned using configurations provided in the cluster profile.
 
-* Navigate to **_Admin > Elastic Profiles_** in the main menu
-* Click the **_+ Elastic Agent Profile_** button to create a new elastic agent profile within the specified cluster.  
+* Navigate to **_Admin > Elastic Agent Configurations_** in the main menu
+* Click the **_+ Elastic Agent Profile_** button to create a new elastic agent profile within the specified cluster.
 
 ![Alt text](images/elastic-agent-profile/new_elastic_agent_profile.png "Elastic profile")
-  
-**_Note:_** *Configuration marked with (\*) are mandatory*
+
+**_Note:_** *Configuration settings marked with (\*) are mandatory*
 
 ## Container configuration
 
-Specify the properties for docker container(s) which will be used to spawn [ecs elastic agent](../gocd-elastic-agent-images/) for GoCD
+Specify the properties for docker container(s) which will be used to spawn ECS elastic agents for GoCD.
 
 ![Alt text](images/elastic-agent-profile/container_configuration.png "Container configuration")
 
-1. **Profile ID:** Specify a unique id for this profile.
+1. **Profile ID:** Specify a unique ID for this profile.
 
 2. **Cluster Profile ID:** This will be auto populated as you are creating elastic agent profile within the cluster profile.
 
-3. **Docker image\*:** [Docker image](elastic_agent_images.md) to spin up container. List of pre build docker images are available [here](https://www.gocd.org/download/#docker)
+3. **Docker image (mandatory)** Docker image to spin up the container. List of pre-built docker images for GoCD agents are available [here](https://www.gocd.org/download/#docker). Here is information to [build your own docker images](elastic_agent_images.md).
 
-4. **Hard memory limit for container\*:** The maximum amount of memory that container is allowed to use. This field takes a positive integer, followed by a suffix of B, K, M, G and T to indicate bytes, kilobytes, megabytes, gigabytes or terabytes respectively. [Read more about memory](https://docs.docker.com/engine/admin/resource_constraints/#memory)
+4. **Hard memory limit for container (mandatory)** The maximum amount of memory that container is allowed to use. This field takes a positive integer, followed by a suffix of B, K, M, G and T to indicate bytes, kilobytes, megabytes, gigabytes or terabytes respectively. [Read more about docker container memory](https://docs.docker.com/engine/admin/resource_constraints/#memory).
 
-5. **Reserved memory for container\*:** The docker container will start with this amount of memory. This option is only available for `Linux` platform. This field takes a positive integer, followed by a suffix of B, K, M, G and T to indicate bytes, kilobytes, megabytes, gigabytes or terabytes respectively. [Read more about memory](https://docs.docker.com/config/containers/resource_constraints/). 
+5. **Reserved memory for container (mandatory)** The docker container will start with this amount of memory. This option is only available for `Linux` platform. This field takes a positive integer, followed by a suffix of B, K, M, G and T to indicate bytes, kilobytes, megabytes, gigabytes or terabytes respectively. [Read more about docker container memory](https://docs.docker.com/config/containers/resource_constraints/).
 
-6. **CPU\*:** The number of cpu units to reserve for the container. A EC2 instance has 1,024 cpu units for every CPU core. This parameter specifies the minimum amount of CPU to reserve for a container. [Read more about CPU](https://docs.docker.com/engine/admin/resource_constraints/#cpu).
+6. **CPU (mandatory)** The number of cpu units to reserve for the container. An EC2 instance has 1024 cpu units for every CPU core. This parameter specifies the minimum amount of CPU to reserve for a container. [Read more about docker CPU constraints](https://docs.docker.com/engine/admin/resource_constraints/#cpu).
     - **Linux:** If set to 0, container will only use unallocated CPU units. Unallocated CPU units are split equally between all containers.
-    - **Windows:** We recommend using at least **1024 CPU units (1 core)** for Windows. Allocating lesser CPU units(including 0) will result in very slow running container.
-    
+    - **Windows:** We recommend using at least **1024 CPU units (1 core)** for Windows. Allocating lesser CPU units (including 0) will result in very slow running container.
+
 7. **Task role arn:** Name of the IAM role to associate with the agent container. This can have any permission that is required by the given job. At the bare minimum your role must permit action `sts:AssumeRole` and allow access to `ecs-tasks.amazonaws.com` service.
     > Bare minimum role template
-      
+
       ```json
-        {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Sid": "",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "ecs-tasks.amazonaws.com"
-              },
-              "Action": "sts:AssumeRole"
-            }
-          ]
-        }
-      ```    
-8. **Mount Docker Socket:** Mounts the host `/var/run/docker.sock` to docker container
-
-9. **Privileged:** When this parameter is true, the container is given elevated privileges on the host container instance. This is useful to run docker in docker workflow.
-
-10. **Docker Command:** Specify the command to run in the container. Enter one parameter per line. This allows you to override the `CMD` that is specified in the `Dockerfile`, or provide one in case the `Dockerfile` does not contain a `CMD`. Read more about [CMD](https://docs.docker.com/engine/reference/builder/#cmd).
-
-11. **Environment Variables:** Specify the environment variables. Enter one variable per line. This allows you to override the `ENV` that is specified in the `Dockerfile`, or provide new environment variables in case the `Dockerfile` does not contain any `ENV`. Read more about [ENV](https://docs.docker.com/engine/reference/builder/#env).
+      {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Sid": "",
+            "Effect": "Allow",
+            "Principal": {
+              "Service": "ecs-tasks.amazonaws.com"
+            },
+            "Action": "sts:AssumeRole"
+          }
+        ]
+      }
+      ```
+
+8. **Mount Docker Socket:** Mounts the host `/var/run/docker.sock` to docker container.
+
+9. **Privileged:** When this parameter is true, the container is given elevated privileges on the host container instance. This is useful to run the docker in docker workflow. This can have security implications (since all docker containers can access the host docker server).
+
+10. **Docker Command:** Specify the command to run in the container. Enter one parameter per line. This allows you to override the `CMD` that is specified in the `Dockerfile`, or provide one in case the `Dockerfile` does not contain a `CMD`. Read more about [docker's CMD](https://docs.docker.com/engine/reference/builder/#cmd).
+
+11. **Environment Variables:** Specify the environment variables. Enter one variable per line. This allows you to override the `ENV` that is specified in the `Dockerfile`, or provide new environment variables in case the `Dockerfile` does not contain any `ENV`. Read more about [docker's ENV](https://docs.docker.com/engine/reference/builder/#env).
     - Environment variables are resolved in following order:
-      1. **_Elastic Profile:_** This will override the variable value specified in `cluster profile` and `Dockerfile`.
+      1. **_Elastic Profile:_** This will override the variable value specified in the cluster profile and `Dockerfile`.
       2. **_Plugin Settings:_** This will override the variable value specified in `Dockerfile`.
-      3. **_Dockerfile:_** Variable defined in `Dockerfile` has low precedence over other two. For example, variable `Foo` defined in cluster profile or elastic profile will override the variable defined in `Dockerfile`.
+      3. **_Dockerfile:_** Variables defined in the `Dockerfile` have low precedence over other two. For example, variable `Foo` defined in the cluster profile or elastic profile will override the variable with the same name defined in `Dockerfile`.
 
-12. **Bind Mount:** Use bind mounts to mount one or more file or directory from the host machine on to the container. The BindMount configuration requires the following configuration,
+12. **Bind Mount:** Use bind mounts to mount one or more files or directories from the host machine on to the container. The BindMount configuration requires the following information:
   - **_Name:_** Name of the volume.
   - **_SourcePath:_** The path from the host machine that needs to be mounted on the container.
   - **_ContainerPath:_** The path on the container to mount the volume at.
@@ -74,35 +75,32 @@ Specify the properties for docker container(s) which will be used to spawn [ecs
              "ContainerPath": "/var/data"
            }
          ]
-       ``` 
+       ```
 
 
 ## EC2 Instance Configuration
 
-Specify the configuration for the EC2 instance. This is optional. If specified, then the docker container(s) will be spawned on the EC2 instance matching specified configuration. Otherwise, it will be spawned on EC2 instance created using the global configuration specified in `Plugin Settings`.
+Specify the configuration for the EC2 instance. This is optional. If specified, then the docker container(s) will be spawned on the EC2 instance matching the specified configuration. Otherwise, it will be spawned on an EC2 instance created using the configuration specified in the corresponding cluster profile.
 
 ![Alt text](images/elastic-agent-profile/ec2_instance_configuration.png "EC2 Instance configuration")
 
-1. **AMI ID:** This AMI ID will be used to spin up EC2 instances that will run docker containers with this profile. If left unspecified, the default AMI ID configured in the cluster profile will be used to spin up an EC2 instance. Read more about [ECS optimized AMIs](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html) 
-    - ECS optimized AMIs for -
-        - [Linux](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html) 
-        - [Windows](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows_getting_started.html#launch_windows_container_instance)
+1. **AMI ID:** This AMI ID will be used to spin up EC2 instances that will run docker containers with this profile. If left unspecified, the default AMI ID configured in the cluster profile will be used to spin up an EC2 instance. Read more about [ECS optimized AMIs](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html) for [Linux](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html) and [Windows](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows_getting_started.html#launch_windows_container_instance).
+
+2. **Instance type:** This instance type will be used to spin up EC2 instances that will run docker containers with this profile. If left unspecified, the default instance type configured in the cluster profile will be used to spin up an EC2 instance. Read more about [EC2 Instance Type](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html).
 
-2. **Instance type:** This instance type will be used to spin up EC2 instances that will run docker containers with this profile. If left unspecified, the default instance type configured in the cluster profile will be used to spin up an EC2 instance. Read more about [Instance Type](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html)  
+3. **IAM instance profile:** The name of the IAM profile that will allow the ECS agent to make calls to AWS on your behalf. Please refer to [pre-requisites](installation.md) for more information. If left unspecified, the `IAM Instance Profile` configured in the cluster profile will be used to spin up an EC2 instance. Read more about [IAM Instance Profiles](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/instance_IAM_role.html).
 
-3. **IAM instance profile:** The name of the IAM profile that will allow the ECS agent to make calls to AWS on your behalf. Please refer [pre-requisites](../prerequisites/) for more information. If left unspecified, the `IAM Instance Profile` configured in the cluster profile will be used to spin up an EC2 instance. Read more about [IAM Instance Profile](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/instance_IAM_role.html)              
-  
-4. **Subnet id(s):** Enter comma separated subnet ids. If multiple subnet ids are specified, the subnet having the least number of EC2 instances will be used to spin up a new EC2 instance. If left unspecified, the `Subnet id(s)` configured in the cluster profile will be used to spin up an EC2 instance. Read more about [VPCs & Subnets](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html)  
+4. **Subnet id(s):** Enter comma separated subnet ids. If multiple subnet ids are specified, the subnet having the least number of EC2 instances will be used to spin up a new EC2 instance. If left unspecified, the `Subnet id(s)` configured in the cluster profile will be used to spin up an EC2 instance. Read more about [VPCs & Subnets](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html).
 
-5. **Security Group Id(s):**  Enter comma separated security group ids. EC2 instances will be assigned the security groups(s) specified here. If left unspecified, the `Security Group Id(s)` configured in the cluster profile will be used to spin up an EC2 instance. Read more about [SecurityGroup](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html)
+5. **Security Group Id(s):**  Enter comma separated security group ids. EC2 instances will be assigned the security groups(s) specified here. If left unspecified, the `Security Group Id(s)` configured in the cluster profile will be used to spin up an EC2 instance. Read more about [VP Security Groups](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html).
 
 6. **Spot Instance Configuration**
-   - **Run As Spot Instance:** On selecting this option the plugin would run a docker container on a EC2 Spot Instance.
+   - **Run As Spot Instance:** On selecting this option the plugin will run a docker container on an EC2 Spot Instance.
    - **Spot Price:** The maximum price per hour that you are willing to pay for the Spot Instance. If not provided defaults to `On-Demand` Price.
-   - **Spot Request Expires After(in minutes):** The plugin supports Spot Instance of type `one-time`. SpotRequestExpiresAfter(in minutes) property is used to set the validity of the Spot Instance request from the time the request is created. Defaults to `5 mins`.
+   - **Spot Request Expires After (in minutes):** The plugin supports Spot Instances of type `one-time`. `Spot Request Expires After (in minutes)` property is used to set the validity of the Spot Instance request from the time the request is created. Defaults to `5` (minutes).
 
-**Note:** Spot Instances can be terminated automatically. The plugin does not track Spot Instance interruption notices, on an instance termination all jobs running on the spot instance will be eventually re-scheduled.
+**Note:** Spot Instances can be terminated automatically by AWS. This plugin does not track Spot Instance interruption notices. On an instance termination, all jobs running on the spot instance will be eventually re-scheduled.
 
 7. Save your changes
 
-**_Note:_** *Configuration marked with (\*) are mandatory*
+**_Note:_** *Configuration settings marked with (\*) are mandatory*
diff --git a/docs/faq.md b/docs/faq.md
index f182458..73f1b4b 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,16 +1,14 @@
 # FAQ
 
-# FAQ
-
-## Q: What is GoCD ECS Elastic Agent Plugin?
+## Q: What is the GoCD ECS Elastic Agent Plugin?
 
-This Elastic Agent Plugin for Amazon EC2 Container Service allows for flexible use of EC2 instances (with support for ECS Docker containers) thereby optimizing utilization and reducing the cost of your agent infrastructure. It will also take care of scaling up and scaling down of your container instances in best possible way.
+This Elastic Agent Plugin for Amazon's EC2 Container Service allows for flexible use of EC2 instances (with support for ECS Docker containers) thereby optimizing utilization and reducing the cost of your GoCD agent infrastructure. It will also take care of scaling up and scaling down of EC2 instances in the most efficient way.
 
 ## Q: Why should I use it?
 
-This elastic agent plugin will help optimize the cost of running your builds on AWS by managing the cluster resources. It will create a container instance as and when required and will terminate the idle container instances based on termination policy that you provide. This will eliminate the need of constantly running AWS EC2 instances as GoCD agents.
+This elastic agent plugin will help optimize the cost of running your builds on AWS by managing the cluster resources. It will create a container instance as and when required and will terminate the idle container instances based on the termination policy that you choose. This will eliminate the need of constantly running AWS EC2 instances as GoCD agents.
 
-## Q: How to install this plugin?
+## Q: How do I install this plugin?
  
 Refer to the installation section available [here](installation.md).
 
@@ -20,7 +18,7 @@ Refer to the [pre-requisites](installation.md#prerequisites) and [configuration]
 
 ## Q: Why does this plugin need AWS credentials?
 
-In order to manage AWS ECS cluster, the plugin makes multiple API calls to AWS ECS on your behalf. Using the credentials, the plugin will authorize itself to AWS.
+In order to manage the AWS ECS cluster, the plugin makes multiple API calls to AWS ECS on your behalf. Using the credentials, the plugin will authorize itself to AWS.
 
 ## Q: How should I configure the AWS credentials for the plugin?
 
@@ -38,18 +36,18 @@ We recommend that you provide AWS credentials using one of the above methods, bu
 
 Running windows containers is supported from the plugin version `5.0.0` onwards.
 
-## Q: Why memory reservation is not available for windows on elastic profile?
+## Q: Why is memory reservation not available for Windows on elastic profile?
 
-Currently, option is not supported by ECS API.
+Currently, that option is not supported by ECS API.
 
-## Q: Is privileged mode supported on windows?
+## Q: Is privileged mode supported on Windows?
 
-No, privileged mode is not supported for windows.
+No, privileged mode is not supported for Windows.
 
 ## Q: Is configuring multiple environments supported by this plugin?
 
-Yes, configuring plugin for different environments is supported using cluster profiles from the plugin version `6.0.0` and onwards.
+Yes, configuring plugin for different environments is supported using cluster profiles from plugin version `6.0.0` and onwards.
 
-## Q. I am using Spot Instances, how do I check for my savings?
+## Q. I am using Spot Instances, how do I check my savings?
 
-The plugin currently does not capture any data to calculate the savings. AWS provides with Spot Instance [Savings Summary](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-savings.html) page to get this information. Alternatively, you can also subscribe the [Spot Instance Data Feed](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html) to get this information from AWS.
+The plugin currently does not capture any data to calculate the savings. AWS provides a Spot Instance [Savings Summary](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-savings.html) page to get this information. Alternatively, you can also subscribe to the [Spot Instance Data Feed](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-data-feeds.html) to get this information from AWS.
diff --git a/docs/images/cluster-profiles/advance_container_configuration.png b/docs/images/cluster-profiles/advance_container_configuration.png
index 1574bfc..2e60fc9 100644
Binary files a/docs/images/cluster-profiles/advance_container_configuration.png and b/docs/images/cluster-profiles/advance_container_configuration.png differ
diff --git a/docs/images/cluster-profiles/aws_cluster_configuration.png b/docs/images/cluster-profiles/aws_cluster_configuration.png
index ce4905a..0130275 100644
Binary files a/docs/images/cluster-profiles/aws_cluster_configuration.png and b/docs/images/cluster-profiles/aws_cluster_configuration.png differ
diff --git a/docs/images/cluster-profiles/aws_credentials.png b/docs/images/cluster-profiles/aws_credentials.png
index 008b05f..f0337a5 100644
Binary files a/docs/images/cluster-profiles/aws_credentials.png and b/docs/images/cluster-profiles/aws_credentials.png differ
diff --git a/docs/images/cluster-profiles/docker_registry.png b/docs/images/cluster-profiles/docker_registry.png
index 03a4c6a..0f3aa6a 100644
Binary files a/docs/images/cluster-profiles/docker_registry.png and b/docs/images/cluster-profiles/docker_registry.png differ
diff --git a/docs/images/cluster-profiles/ec2_instance_settings.png b/docs/images/cluster-profiles/ec2_instance_settings.png
index f02c9ae..fcfbfb0 100644
Binary files a/docs/images/cluster-profiles/ec2_instance_settings.png and b/docs/images/cluster-profiles/ec2_instance_settings.png differ
diff --git a/docs/images/cluster-profiles/efs.png b/docs/images/cluster-profiles/efs.png
index 3d6d6ed..0f3aa6a 100644
Binary files a/docs/images/cluster-profiles/efs.png and b/docs/images/cluster-profiles/efs.png differ
diff --git a/docs/images/cluster-profiles/initial_cluster_configuration.png b/docs/images/cluster-profiles/initial_cluster_configuration.png
index 45f9fd8..54b90a3 100644
Binary files a/docs/images/cluster-profiles/initial_cluster_configuration.png and b/docs/images/cluster-profiles/initial_cluster_configuration.png differ
diff --git a/docs/images/cluster-profiles/linux_instance_settings.png b/docs/images/cluster-profiles/linux_instance_settings.png
index 13e424f..37d0d84 100644
Binary files a/docs/images/cluster-profiles/linux_instance_settings.png and b/docs/images/cluster-profiles/linux_instance_settings.png differ
diff --git a/docs/images/cluster-profiles/log_configuration.png b/docs/images/cluster-profiles/log_configuration.png
index 902e186..d3e3b1b 100644
Binary files a/docs/images/cluster-profiles/log_configuration.png and b/docs/images/cluster-profiles/log_configuration.png differ
diff --git a/docs/images/cluster-profiles/new_cluster_profile_button.png b/docs/images/cluster-profiles/new_cluster_profile_button.png
index 96d4f20..c26a3b0 100644
Binary files a/docs/images/cluster-profiles/new_cluster_profile_button.png and b/docs/images/cluster-profiles/new_cluster_profile_button.png differ
diff --git a/docs/images/cluster-profiles/new_cluster_profile_popup.png b/docs/images/cluster-profiles/new_cluster_profile_popup.png
index 2fd9923..a8421cc 100644
Binary files a/docs/images/cluster-profiles/new_cluster_profile_popup.png and b/docs/images/cluster-profiles/new_cluster_profile_popup.png differ
diff --git a/docs/images/cluster-profiles/windows_instance_settings.png b/docs/images/cluster-profiles/windows_instance_settings.png
index ebda76b..93be80b 100644
Binary files a/docs/images/cluster-profiles/windows_instance_settings.png and b/docs/images/cluster-profiles/windows_instance_settings.png differ
diff --git a/docs/images/elastic-agent-profile/container_configuration.png b/docs/images/elastic-agent-profile/container_configuration.png
index d9af7c7..5a10a99 100644
Binary files a/docs/images/elastic-agent-profile/container_configuration.png and b/docs/images/elastic-agent-profile/container_configuration.png differ
diff --git a/docs/images/elastic-agent-profile/ec2_instance_configuration.png b/docs/images/elastic-agent-profile/ec2_instance_configuration.png
index 2aee69d..bb88adb 100644
Binary files a/docs/images/elastic-agent-profile/ec2_instance_configuration.png and b/docs/images/elastic-agent-profile/ec2_instance_configuration.png differ
diff --git a/docs/images/elastic-agent-profile/new_elastic_agent_profile.png b/docs/images/elastic-agent-profile/new_elastic_agent_profile.png
index 11efbcd..ca4eb23 100644
Binary files a/docs/images/elastic-agent-profile/new_elastic_agent_profile.png and b/docs/images/elastic-agent-profile/new_elastic_agent_profile.png differ
diff --git a/docs/images/troubleshooting/status_report_link.png b/docs/images/troubleshooting/status_report_link.png
index f728e8f..24bde88 100644
Binary files a/docs/images/troubleshooting/status_report_link.png and b/docs/images/troubleshooting/status_report_link.png differ
diff --git a/docs/installation.md b/docs/installation.md
index e4197a6..41bb593 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -11,8 +11,8 @@ Table of Contents
 
 In order to use GoCD's Amazon ECS Elastic Agent Plugin, the following pre-requisites must be met.
 
-* The GoCD server version **19.3.0** or higher.
-* The plugin mandates a few Amazon ECS pre-requisities like an empty ECS cluster and IAM user and role to be configured with appropriate permisssions.
+* The GoCD server version should be **19.3.0** or higher.
+* The plugin mandates a few Amazon ECS pre-requisities like an empty ECS cluster and IAM user and role to be configured with appropriate permissions.
 
 ### Configure ECS using the *AWS CloudFormation* template:
 
@@ -23,75 +23,74 @@ To configure ECS using the AWS CloudFormation templates, follow these steps,
 * `$ pip install awscli` - To install aws cli (refer - [https://aws.amazon.com/cli/](https://aws.amazon.com/cli/))
 * `$ aws configure` - Configure the aws cli with appropriate credentials
 * Configure using ruby based template,
-  * Save [Ruby Based Template](ecs_cloud_formation_template.rb.txt) to a file.
+  * Save [Ruby Based Cloudformation Template](ecs_cloud_formation_template.rb.txt) to a file.
   * `$ gem install cloudformation-ruby-dsl`
   * `$ ruby <cloud_formation_ruby_template_file>.rb create --stack-name <stack_name> --parameters "ClusterName=<cluster_name>"`
 * Alternatively, configure using the JSON based template
-  * Save [JSON Based Template](ecs_cloud_formation_template.json) to a file.
+  * Save [JSON Based Cloudformation Template](ecs_cloud_formation_template.json) to a file.
   * ```$ aws cloudformation create-stack --stack-name <stack_name> --region <region_name> --capabilities CAPABILITY_IAM --template-body file:///<path_to_json_template_file>```
 
 ---
 ### Alternatively configure ECS manually (if you prefer to manually configure ECS instead of using the above CloudFormation template).
 
   * An ECS cluster. This cluster MUST be empty, as the plugin will manage instances and scaling in this cluster.
-  * An IAM user with permissions to manage the ECS cluster. The credentials for this IAM user may be provided to the this plugin or applied via an IamInstanceProfile to the EC2 instance running the GoCD server. The following IAM permissions are needed
+  * An IAM user with permissions to manage the ECS cluster. The credentials for this IAM user may be provided to the this plugin or applied via an IAM instance profile to the EC2 instance running the GoCD server. The following IAM permissions are needed
 
     ```
-      ec2:createTags
-      ec2:runInstances
-      ec2:describeSubnets
-      ec2:describeInstances
-      ec2:terminateInstances
-      ec2:createVolume
-      ec2:attachVolume
-      iam:PassRole
-      iam:GetRole
-      ecs:describeClusters
-      ecs:startTask
-      ecs:stopTask
-      ecs:listTasks
-      ecs:describeTasks
-      ecs:describeTaskDefinition
-      ecs:registerTaskDefinition
-      ecs:listContainerInstances
-      ecs:deregisterTaskDefinition
-      ecs:describeContainerInstances
-      ecs:deregisterContainerInstance
-      ec2:stopInstances
-      ec2:startInstances
-      ec2:deleteTags
+    ec2:createTags
+    ec2:runInstances
+    ec2:describeSubnets
+    ec2:describeInstances
+    ec2:terminateInstances
+    ec2:createVolume
+    ec2:attachVolume
+    iam:PassRole
+    iam:GetRole
+    ecs:describeClusters
+    ecs:startTask
+    ecs:stopTask
+    ecs:listTasks
+    ecs:describeTasks
+    ecs:describeTaskDefinition
+    ecs:registerTaskDefinition
+    ecs:listContainerInstances
+    ecs:deregisterTaskDefinition
+    ecs:describeContainerInstances
+    ecs:deregisterContainerInstance
+    ec2:stopInstances
+    ec2:startInstances
+    ec2:deleteTags
     ```
     
     Additionally, if Spot Instances are used, the additional permissions are needed:
     
     ```
-      ec2:requestSpotInstances
-      ec2:describeSpotInstanceRequests
+    ec2:requestSpotInstances
+    ec2:describeSpotInstanceRequests
     ```
 
 
-  * An IAM Role that allows the ECS agent running on the EC2 instance to register container instances with ECS cluster. The IamInstanceProfile must have following permissions:
+  * An IAM Role that allows the ECS agent running on the EC2 instance to register container instances with ECS cluster. The IAM instance profile must have following permissions:
 
     ```
-      ecs:poll
-      ecs:describeClusters
-      ecs:discoverPollEndpoint
-      ecs:startTelemetrySession
-      ecs:submitTaskStateChange
-      ecs:registerContainerInstance
-      ecs:submitContainerStateChange
-      ecs:deregisterContainerInstance
-      logs:PutLogEvents
-      logs:CreateLogStream
+    ecs:poll
+    ecs:describeClusters
+    ecs:discoverPollEndpoint
+    ecs:startTelemetrySession
+    ecs:submitTaskStateChange
+    ecs:registerContainerInstance
+    ecs:submitContainerStateChange
+    ecs:deregisterContainerInstance
+    logs:PutLogEvents
+    logs:CreateLogStream
     ```
 
 ### Related help topics
 
-1. [Getting Started with Amazon ECS](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_GetStarted.html)
-2. [Amazon ECS Container Instance IAM Role](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/instance_IAM_role.html)
-3. [Amazon ECS IAM Policy Examples](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/IAMPolicyExamples.html#first-run-permissions)
-3. [Amazon ECS Task Role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html#create_task_iam_policy_and_role)
-3. [Amazon ECS Task Role Example Template](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_IAM_role.html)
+1. [Getting Started with Amazon ECS](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/Welcome.html)
+2. [Amazon ECS Container Instance IAM Role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/instance_IAM_role.html)
+3. [Amazon ECS IAM Policy Examples](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/security_iam_id-based-policy-examples.html)
+4. [Amazon ECS Task Role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html)
 
 ## Installation
 
@@ -103,8 +102,8 @@ and restart the server.
 
 In order to use this plugin, users have to configure the following in the GoCD server.
 
-- [Configure cluster profile(s)](cluster_profile_configuration.md) - The cluster profile settings are used to provide the cluster level configurations for the plugin. Each cluster profile specifies Configurations such as AWS credentials, EC2 Instance settings, Docker Container settings, ECS Cluster configurations. Users are encouraged to define one cluster per environment. 
+1. [Configure cluster profile(s)](cluster_profile_configuration.md) - The cluster profile settings are used to provide the cluster level configurations for the plugin. Each cluster profile specifies Configurations such as AWS credentials, EC2 Instance settings, Docker Container settings, ECS Cluster configurations. Users are encouraged to define one cluster per environment. 
 
-- [Create elastic agent profile(s)](elastic_profile_configuration.md) - The Elastic Agent Profile is used to define the configuration of a docker container. The profile is used to configure the docker image, set memory limits, provide docker command and environment variables. 
+2. [Create elastic agent profile(s)](elastic_profile_configuration.md) - The Elastic Agent Profile is used to define the configuration of a docker container. The profile is used to configure the docker image, set memory limits, provide docker command and environment variables. 
 
-- [Configure job to use an elastic agent profile](job_configuration.md) - This is a job level configuration to specify the elastic profile to be used for a job. When a job is scheduled the plugin would spin up a docker container using the configuration provided in the associated elastic profile.
+3. [Configure job to use an elastic agent profile](job_configuration.md) - This is a job level configuration to specify the elastic profile to be used for a job. When a job is scheduled the plugin would spin up a docker container using the configuration provided in the associated elastic profile.
diff --git a/docs/job_configuration.md b/docs/job_configuration.md
index ea441cb..3441a2f 100644
--- a/docs/job_configuration.md
+++ b/docs/job_configuration.md
@@ -1,10 +1,10 @@
-# Configure job to use an elastic agent profile
+# Associate the job with an elastic agent profile
 
-The Elastic Agent Profile is used to define the configuration of a docker container, it is used to configure the docker image, set memory limits, provide docker command and environment variables.
+The Elastic Agent Profile is used to define the configuration of a docker container. It is used to configure the docker image, set memory limits, provide docker command and environment variables.
 
-Following configuration ties your job with an Elastic Agent Profile, it effectively means that the plugin will run your job on newly created docker container using configuration defined in that elastic agent profile.  
+The following configuration associates a GoCD job with an Elastic Agent Profile. It effectively means that the plugin will run your job on a newly created docker container using configuration defined in that elastic agent profile.
 
-### Steps to configure job to use ECS Elastic Agent: 
+### Steps to configure job to use ECS Elastic Agent:
 
 * Click the gear icon on **_Pipeline_**
 
diff --git a/docs/plugin_as_images.md b/docs/plugin_as_images.md
index acaf2fa..66e5bb7 100644
--- a/docs/plugin_as_images.md
+++ b/docs/plugin_as_images.md
@@ -8,12 +8,10 @@
 
 ![Alt text](images/image4.png "Starts ECS containers")
 
-![Alt text](images/image5.png "Stage finishes. ECS containers 
-destroyed")
+![Alt text](images/image5.png "Stage finishes. ECS containers destroyed")
 
 ![Alt text](images/image6.png "Next stage starts")
 
-![Alt text](images/image7.png "Stage finishes. ECS containers 
-destroyed")
+![Alt text](images/image7.png "Stage finishes. ECS containers destroyed")
 
 ![Alt text](images/image8.png "EC2 nodes terminated")