diff --git a/pkg/cfn/builder/nodegroup.go b/pkg/cfn/builder/nodegroup.go
index ea6f54f2a9..a061732564 100644
--- a/pkg/cfn/builder/nodegroup.go
+++ b/pkg/cfn/builder/nodegroup.go
@@ -70,8 +70,9 @@ func (n *nodeGroupResourceSet) AddAllResources() error {
 	n.rs.newStringParameter(ParamClusterStackName, "")
 	n.rs.newNumberParameter(ParamNodeGroupID, "")
 
-	// TODO: imporve validation of parameter set overall, probably in another package
-	// TODO: validate custom AMI (check it's present) and instance type
+	// TODO: https://github.com/weaveworks/eksctl/issues/28
+	// - imporve validation of parameter set overall, probably in another package
+	// - validate custom AMI (check it's present) and instance type
 	if n.spec.NodeAMI == "" {
 		n.spec.NodeAMI = regionalAMIs[n.spec.Region]
 	}
diff --git a/pkg/nodebootstrap/assets.go b/pkg/nodebootstrap/assets.go
index 203ec371c0..8c662d9cf4 100644
--- a/pkg/nodebootstrap/assets.go
+++ b/pkg/nodebootstrap/assets.go
@@ -132,7 +132,7 @@ func get_credentialsSh() (*asset, error) {
 	return a, nil
 }
 
-var _get_metadataSh = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x54\xdf\x6f\xe2\x46\x10\x7e\xf7\x5f\x31\xdd\x20\x71\x48\xd8\x2e\x69\xae\xb9\x46\xf2\x55\x51\xa1\x15\xca\x35\x9c\x2e\xb9\xf6\xa1\x3d\x91\xc5\x1e\xcc\x5e\x96\x5d\xdf\xee\x18\x07\x11\xfe\xf7\x6a\x8c\x21\x2e\x49\xdb\xeb\x93\xe5\xf9\xf1\xcd\xcc\x37\xf3\xed\xc9\x37\xf1\x4c\x99\x78\x26\xfd\x22\x08\x4e\x60\x32\x23\xa9\x0c\x2c\x91\x64\x26\x49\x82\x9c\xd9\x92\x80\x16\x08\xca\x78\x92\x26\xc5\x3e\x14\xd2\x79\x04\xbc\xf7\x29\x69\x20\x99\xc3\x4a\xea\x12\x81\x2c\x48\x93\x41\xe5\x14\x21\x70\xd6\xdd\x1e\x25\x42\xb3\xba\xab\x9d\x77\xf7\xe5\x0c\x35\x52\xa4\x6d\x2a\x75\x6d\x0f\x4e\x60\x6e\x1d\x58\x5a\xa0\x03\x9f\x3a\x55\x90\xaf\x63\xb9\xa8\x5f\x7b\xc2\x65\x06\xa5\x51\xc4\x05\x4a\x8f\x41\xe0\x91\x20\xb4\x80\xce\xe1\x83\xa2\xfd\x6f\xa1\x0a\x9c\x4b\xa5\xf7\xff\xc6\x96\xc6\x23\xf1\x50\x15\x42\x6a\x4b\x9d\x71\x7a\x0d\x3b\xb7\x5a\xdb\x4a\x99\xbc\x0f\xb3\x92\xd8\xef\x49\x69\x0d\x06\x31\x83\xcf\x5f\xb8\x52\x8e\x04\x0e\x73\x65\x4d\xdd\xcc\x7e\x7a\x18\x0f\x2f\x82\x13\x90\x95\x87\x30\xb4\x25\x15\xcc\x0e\x3e\x10\x84\x61\x13\x5d\xfa\xb0\x42\x4f\xe1\x29\x60\x7a\x0a\x19\xf2\x48\x33\x0c\x49\xe6\x9c\x32\x57\x9a\xd0\x79\xb8\x96\x4b\x4c\x1c\x7a\x5b\xba\x14\x43\x5a\x17\xd8\xff\x8d\x59\xf4\xc9\xa1\xd2\xdf\x43\x54\x76\x08\x08\xbf\x1d\x9c\xe3\x77\xe7\x67\xaf\x4f\x11\x07\x67\xd9\x9b\xec\x1c\xc2\xf0\x4b\x89\x6e\x0d\xe2\x56\xe6\xfe\x8f\x1f\xaf\x70\x9d\x24\xdd\xdd\x86\xa2\x54\x97\x9e\xd0\x45\xf7\x6f\x7c\xa4\x6c\xbc\x1a\x48\x5d\x2c\xe4\x20\x6e\xec\xa1\x91\x4b\xec\x7e\x8a\x6a\x74\xc1\x74\xdd\x4e\x86\x93\x0b\xc0\x87\x02\x9d\x5a\xa2\x21\xa8\x14\x2d\x40\xc2\xd2\x3a\x26\x4a\x92\x4a\x61\x85\xce\x2b\x6b\xfa\x35\xb7\xd2\x40\x21\xbd\x6f\xf3\xd5\x80\x03\x83\xd7\x86\x1c\x0d\x3a\x49\x08\xd5\xc2\x6a\x3c\xbe\x0d\x35\x67\xa0\x4a\x1a\xc2\x0c\xc8\x06\xc1\x9e\x85\xb1\x99\xdb\x44\x74\x5e\xa5\xa5\xd3\x10\x86\x5e\x69\x6e\x68\x41\x54\x5c\xc4\xf1\xe0\xfb\x1f\xa2\xd3\xd7\x67\x51\xf3\x8d\xb5\x24\xf4\x14\x67\x6b\x23\x97\x2a\x8d\xf7\x18\xa1\xca\xd0\x90\xa2\x75\x9c\xd9\xb4\xe4\x89\x7a\xa2\x55\x61\xc8\xf8\x98\x2e\x2c\x88\xce\xa6\x5d\x77\x2b\xe0\x91\xaf\x21\x74\x10\x1d\xec\x59\x4f\xec\x52\x8b\x14\xc7\xef\xbf\x26\xb5\x70\x6a\x25\x09\xc7\x05\x57\xbd\xfc\xfd\x66\x3a\x1c\xfd\x7c\xf9\xf1\xdd\xed\xf4\xc3\xe8\x97\xf1\xe4\xfa\x6b\x20\x76\xc4\x72\x3e\x3e\x14\xd6\x11\x3c\x87\xe1\xc5\x1d\x54\x3b\x57\x1a\x41\x79\x50\x86\xd0\x64\x98\xb5\x14\xc6\x42\x7f\x92\x99\x87\x0a\xb5\xe6\x6f\x5b\x69\xbe\x0f\xde\x82\xa2\x2e\x23\x80\x57\xcb\x42\xb3\x66\xdc\x52\x52\xb0\x6b\xf5\x85\x31\x3a\x9b\xe7\xc6\xad\x00\x78\x0b\x31\x52\x1a\xef\x8e\x31\x6e\xaf\x3d\x68\xc0\xae\x27\xc3\xd1\x74\xfc\x3e\x69\xe6\xaf\x89\xdd\x8a\xa3\xc4\x67\x0f\x47\x10\xe4\x48\x53\x96\xd5\xab\x1e\x6c\x02\xa8\x35\xf9\x5c\x72\x7f\x06\x00\xf0\xa4\xd5\xcf\xde\x9a\x83\x6d\x2f\x46\xf1\xdf\x6a\x14\xc7\x41\x4f\x7a\x6c\xad\x6d\xb8\x15\xc1\x76\xd7\x58\x23\x80\x29\x0b\xa0\x69\x10\x9a\x75\x76\xa3\x5a\xa5\x9f\xe0\x11\x3c\x6a\x4c\xe9\x55\x74\x85\x6b\x48\x12\x10\xff\x43\xb2\xa2\x07\x8f\xb0\x53\x6d\x97\x8b\xa6\x0b\x4c\xef\x0f\x65\x6d\x65\x30\x3b\xd4\x25\x99\x27\x82\x19\x74\x06\x09\x6b\xcc\x26\x30\xee\x6c\x06\x5b\x71\x68\x2e\x94\x2e\xaf\x9f\x74\xd1\xd9\x90\xcc\xb7\xe2\xdf\xfb\xed\x90\xcc\x8f\xda\x60\xd2\xf9\xa4\xf7\xcb\xe1\xa3\x6d\x73\xd1\x3e\x77\xf6\xd7\x67\x7e\x4c\x18\x27\xb1\x94\xe1\xa5\xe0\x17\x06\x65\x7f\x3b\x7f\x2b\x7a\x02\x12\x10\xb5\x53\x04\xad\xa3\x1d\x5d\xdd\x4c\x7f\x7a\xf7\xf1\xe6\x76\xf4\x61\x7a\x7d\xf9\xeb\x28\x39\x4e\x04\x78\xfb\xcf\x17\xfb\x57\x00\x00\x00\xff\xff\x34\x10\xc0\x45\x2d\x07\x00\x00")
+var _get_metadataSh = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x54\x5d\x6e\xe3\x36\x17\x7d\xd7\x2a\xee\xc7\x18\x70\x0c\x44\xd2\xe7\x34\x69\xa6\x01\x34\x45\x50\xbb\x85\x91\x69\x3c\x98\x64\xda\x87\x76\xe0\xd0\xd2\xb5\xc4\x31\x4d\x6a\x78\xaf\xec\x18\x8e\x81\xee\xa1\x1b\xe8\x5a\xba\x94\xae\xa4\xa0\xfc\x13\xd5\x49\xdb\xe9\x93\x20\xf2\x9e\x73\xee\xdf\xe1\xd1\xff\xe2\xb1\x32\xf1\x58\x52\x11\x04\x47\x30\x1c\xb3\x54\x06\x66\xc8\x32\x93\x2c\x41\x8e\x6d\xc5\xc0\x05\x82\x32\xc4\xd2\xa4\x78\x02\xa5\x74\x84\x80\x53\x4a\x59\x03\xcb\x1c\xe6\x52\x57\x08\x6c\x41\x9a\x0c\x16\x4e\x31\x82\x47\xdd\xef\x58\x22\x34\xf3\xfb\xfa\xf2\x7e\x5a\x8d\x51\x23\x47\xda\xa6\x52\xd7\xe7\xc1\x11\x4c\xac\x03\xcb\x05\x3a\xa0\xd4\xa9\x92\xa9\x8e\xf5\xa2\xb4\x24\xc6\x59\x06\x95\x51\xec\x05\x2a\xc2\x20\x20\x64\x08\x2d\xa0\x73\xf8\xa0\x78\xf7\x5b\xaa\x12\x27\x52\xe9\xdd\xbf\xb1\x95\x21\x64\x5f\xd4\x02\x21\xb5\x95\xce\x3c\xbc\xa6\x9d\x58\xad\xed\x42\x99\xfc\x04\xc6\x15\xfb\x7b\x62\xa5\x35\x18\xc4\x0c\x3e\x7e\xf2\x4a\x39\x32\x38\xcc\x95\x35\x75\x32\xbb\xea\x61\xd0\xbb\x0c\x8e\x40\x2e\x08\xc2\xd0\x56\x5c\xfa\xee\xe0\x03\x43\x18\x6e\xa3\x2b\x0a\x17\x48\x1c\x9e\x02\xa6\xa7\x90\xa1\x2f\x69\x8c\x21\xcb\xdc\x43\x26\x4a\x33\x3a\x82\x1b\x39\xc3\xc4\x21\xd9\xca\xa5\x18\xf2\xb2\xc4\x93\x1f\x7c\x17\x29\xd9\x2b\xfd\x35\x44\x65\xfb\x80\xf0\xff\xdd\x0b\xfc\xe2\xe2\xec\xfc\x14\xb1\x7b\x96\xbd\xca\x2e\x20\x0c\x3f\x55\xe8\x96\x20\xee\x64\x4e\x3f\x7d\x7d\x8d\xcb\x24\x69\x6f\x26\x14\xa5\xba\x22\x46\x17\x4d\x5f\x51\xa4\x6c\x3c\xef\x4a\x5d\x16\xb2\x1b\x6f\xcf\x43\x23\x67\xd8\xfe\x10\xd5\xec\xc2\xb7\xeb\x6e\xd8\x1b\x5e\x82\x9c\x5b\x95\x41\x21\xe7\xca\xe4\xbe\x21\x99\x05\xa9\x35\x70\xa1\x08\xfe\xf8\xe5\xd7\xdf\x7f\x2b\x98\x4b\xba\x8c\xe3\x5c\x71\x51\x8d\xa3\xd4\xce\xe2\x05\xca\x39\x2e\xac\x9b\x52\xbc\x11\x8f\x15\x51\x85\x14\x77\xcf\x2f\x82\x60\x57\xd9\xc0\x4c\x6c\x22\x5a\xc7\x69\xe5\x34\x84\x21\x29\x8d\x86\xc1\xd3\x5d\xc6\x71\xf7\xcb\xaf\xa2\xd3\xf3\xb3\x68\xfb\x8d\xb5\x64\x24\x8e\xb3\xa5\x91\x33\x95\xc6\x3b\x8e\x50\x65\x68\x58\xf1\x32\xce\x6c\x5a\xcd\xd0\x70\x47\x34\x14\x7a\x9e\x1f\xd3\xc2\x82\x68\xad\x9a\xba\x6b\x01\x8f\x7e\xc2\xa1\x83\x68\x7f\x9e\x75\xc4\x06\x5a\xa6\x38\x78\xfb\x39\xd0\xd2\xa9\xb9\x64\x1c\x94\x5e\xf5\xea\xc7\xdb\x51\xaf\xff\xed\xd5\xfb\x37\x77\xa3\x77\xfd\xef\x06\xc3\x9b\xcf\xa1\xd8\xac\x8b\xc7\xe3\x43\x69\x1d\xc3\x73\x1a\x3f\x8c\xbd\x13\x27\x4a\x23\x28\x02\x65\x18\x4d\x86\x59\xc3\x35\xde\xbc\x4f\xd6\x21\x58\xa0\xd6\xfe\xdb\x74\x0f\x9d\x00\x59\x50\xdc\xf6\x0c\x40\x6a\x56\x6a\xef\x03\x37\x93\x1c\x6c\x52\x7d\xa1\x8c\xd6\xea\xf9\xe1\x5a\x00\xbc\x86\x18\x39\xdd\xcd\xb8\x69\xf3\x60\x4b\x76\x33\xec\xf5\x47\x83\xb7\xc9\xb6\xfe\xba\xb1\x6b\x71\x00\x7c\xf6\x18\x04\x41\x8e\x3c\xf2\x56\x39\xee\xc0\x2a\x80\xda\x67\xcf\x6d\xf4\x73\x00\x00\x4f\xfe\xfb\x48\xd6\xec\xcf\x76\x06\x13\xff\xee\x30\x71\x18\xf4\xe4\xb1\xc6\xd8\x7a\x6b\x11\xac\x37\x89\x6d\x1d\x33\xf2\x8e\xd9\x26\x08\xdb\x71\xb6\xa3\xda\x79\x1f\xe0\x11\x08\x35\xa6\x7c\x1c\x5d\xe3\x12\x92\x04\xc4\x7f\xb0\xa1\xe8\xc0\x23\x6c\x9c\xd8\xf6\xa2\x69\x81\xe9\x74\x2f\x6b\x17\x06\xb3\xbd\x2e\xcb\x3c\x11\xbe\x83\xce\x20\x63\xcd\xb9\x0d\x8c\x5b\xab\xee\x5a\xec\x93\x0b\xa5\xcb\xeb\x67\x5a\xb4\x56\x2c\xf3\xb5\xf8\xe7\x7c\x5b\x2c\xf3\x83\x34\x7c\xd3\xfd\x4a\xef\x86\xe3\x97\xb6\xd9\x8b\xe6\xba\xfb\xfb\x7a\xcd\x0f\x1b\xe6\x41\xde\xca\xf0\x52\xf0\x0b\x85\xfa\xfb\x26\x7e\x2d\x3a\x02\x12\x10\xf5\xa5\x08\x1a\x4b\xdb\xbf\xbe\x1d\x7d\xf3\xe6\xfd\xed\x5d\xff\xdd\xe8\xe6\xea\xfb\x7e\x72\x08\x04\x78\xfd\xf7\x1b\xfb\x67\x00\x00\x00\xff\xff\x59\x14\x0f\xe6\x01\x07\x00\x00")
 
 func get_metadataShBytes() ([]byte, error) {
 	return bindataRead(
@@ -147,7 +147,7 @@ func get_metadataSh() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "get_metadata.sh", size: 1837, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
+	info := bindataFileInfo{name: "get_metadata.sh", size: 1793, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/pkg/nodebootstrap/assets/get_metadata.sh b/pkg/nodebootstrap/assets/get_metadata.sh
index f94a9c778d..893e27e1d1 100644
--- a/pkg/nodebootstrap/assets/get_metadata.sh
+++ b/pkg/nodebootstrap/assets/get_metadata.sh
@@ -10,7 +10,7 @@ set -o nounset
 # we could use the following, but we still need jq to get region and instance ID:
 # aws --output text --region us-west-2 ec2 describe-tags --filters Name=resource-type,Values=instance Name=resource-id,Values=i-017e37452ee14d8d7 --query "Tags[?Key=='eksctl.cluster.k8s.io/v1alpha1/cluster-name'].Value"
 
-# TODO: experiment with a more static version, we can pass region and cluster name and generate whole `metadata.env` if we wanted to
+# TODO: avoid having to do all this – https://github.com/weaveworks/eksctl/issues/157
 
 instanceInfo="$(curl --silent http://169.254.169.254/latest/dynamic/instance-identity/document)"
 
diff --git a/pkg/nodebootstrap/userdata.go b/pkg/nodebootstrap/userdata.go
index f3cc86be90..9110409214 100644
--- a/pkg/nodebootstrap/userdata.go
+++ b/pkg/nodebootstrap/userdata.go
@@ -62,10 +62,10 @@ func setKubeletParams(config *cloudconfig.CloudConfig, spec *api.ClusterConfig)
 	if spec.MaxPodsPerNode == 0 {
 		spec.MaxPodsPerNode = maxPodsPerNodeType[spec.NodeType]
 	}
-	// TODO: investigate if we can use componentconfig, or at least switch to kubelet config file
+	// TODO: use componentconfig or kubelet config file – https://github.com/weaveworks/eksctl/issues/156
 	kubeletParams := []string{
 		fmt.Sprintf("MAX_PODS=%d", spec.MaxPodsPerNode),
-		// TODO: this will need to change when we provide options for using different VPCs and CIDRs
+		// TODO: this will need to change when we provide options for using different VPCs and CIDRs – https://github.com/weaveworks/eksctl/issues/158
 		"CLUSTER_DNS=10.100.0.10",
 	}