diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go
index 632e3c2da..48b0569ac 100644
--- a/builder/amazon/common/ami_config.go
+++ b/builder/amazon/common/ami_config.go
@@ -13,9 +13,9 @@ import (
 
 // AMIConfig is for common configuration related to creating AMIs.
 type AMIConfig struct {
-	// The name of the resulting AMI that will appear when
-	// managing AMIs in the AWS console or via APIs. This must be unique. To help
-	// make this unique, use a function like timestamp (see [template
+	// The name of the resulting AMI that will appear when managing AMIs in the
+	// AWS console or via APIs. This must be unique. To help make this unique,
+	// use a function like timestamp (see [template
 	// engine](../templates/engine.html) for more info).
 	AMIName string `mapstructure:"ami_name" required:"true"`
 	// The description to set for the resulting
@@ -51,13 +51,12 @@ type AMIConfig struct {
 	// [template engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
 	AMITags TagMap `mapstructure:"tags" required:"false"`
-	// Enable enhanced networking (ENA but not
-	// SriovNetSupport) on HVM-compatible AMIs. If set, add
-	// ec2:ModifyInstanceAttribute to your AWS IAM policy. If false, this will
-	// disable enhanced networking in the final AMI as opposed to passing the
-	// setting through unchanged from the source. Note: you must make sure
-	// enhanced networking is enabled on your instance. [Amazon's
-	// documentation on enabling enhanced
+	// Enable enhanced networking (ENA but not SriovNetSupport) on
+	// HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your
+	// AWS IAM policy.
+	//
+	// Note: you must make sure enhanced networking is enabled on your
+	// instance. See [Amazon's documentation on enabling enhanced
 	// networking](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking.html#enabling_enhanced_networking).
 	AMIENASupport config.Trilean `mapstructure:"ena_support" required:"false"`
 	// Enable enhanced networking (SriovNetSupport but not ENA) on
diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index 2e8997a7a..d42825032 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -152,11 +152,9 @@ type RunConfig struct {
 	//
 	// `security_group_ids` take precedence over this.
 	SecurityGroupFilter SecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false"`
-	// Tags to apply to the instance that is *launched* to create the AMI.
-	// These tags are *not* applied to the resulting AMI unless they're
-	// duplicated in `tags`. This is a [template
-	// engine](/docs/templates/engine.html), see [Build template
-	// data](#build-template-data) for more information.
+	// Tags to apply to the instance that is that is *launched* to create the
+	// EBS volumes. This is a [template engine](/docs/templates/engine.html),
+	// see [Build template data](#build-template-data) for more information.
 	RunTags map[string]string `mapstructure:"run_tags" required:"false"`
 	// The ID (not the name) of the security
 	// group to assign to the instance. By default this is not set and Packer will
diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go
index 90313e0c5..57486be4b 100644
--- a/builder/cloudstack/config.go
+++ b/builder/cloudstack/config.go
@@ -59,9 +59,14 @@ type Config struct {
 	// The size (in GB) of the root disk of the new
 	// instance. This option is only available when using source_template.
 	DiskSize int64 `mapstructure:"disk_size" required:"false"`
-	//
+	// If `true` make a call to the CloudStack API, after loading image to
+	// cache, requesting to check and detach ISO file (if any) currently
+	// attached to a virtual machine. Defaults to `false`. This option is only
+	// available when using `source_iso`.
 	EjectISO bool `mapstructure:"eject_iso"`
-	//
+	// Configure the duration time to wait, making sure virtual machine is able
+	// to finish installing OS before it ejects safely. Requires `eject_iso`
+	// set to `true` and this option is only available when using `source_iso`.
 	EjectISODelay time.Duration `mapstructure:"eject_iso_delay"`
 	// Set to true to expunge the instance when it is
 	// destroyed. Defaults to false.
diff --git a/website/source/docs/builders/amazon-ebsvolume.html.md.erb b/website/source/docs/builders/amazon-ebsvolume.html.md.erb
index 52f95efdd..b44b018aa 100644
--- a/website/source/docs/builders/amazon-ebsvolume.html.md.erb
+++ b/website/source/docs/builders/amazon-ebsvolume.html.md.erb
@@ -15,11 +15,10 @@ The `amazon-ebsvolume` Packer builder is able to create Amazon Elastic Block
 Store volumes which are prepopulated with filesystems or data.
 
 This builder creates EBS volumes by launching an EC2 instance from a source
-provisioning that running machine, and then destroying the source machine,	AMI.
-One or more EBS volumes are attached to the running instance, allowing keeping
-the volumes intact.	them to be provisioned into from the running machine. Once
-provisioning is complete the source machine is destroyed. The provisioned
-volumes are kept intact.
+AMI. One or more EBS volumes are attached to the running instance, allowing
+them to be provisioned into from the running machine. Once provisioning is
+complete the source machine is destroyed. The provisioned volumes are kept
+intact.
 
 This is all done in your own AWS account. The builder will create temporary key
 pairs, security group rules, etc. that provide it temporary access to the