diff --git a/CHANGELOG b/CHANGELOG
index 8d66bc5cf30..f60cd09e0a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,7 +35,7 @@ Version 0.3.0 - Oct 27th 2016
 - Changing file sync method to unison in order to get two-way syncing.
 - Fixed issue in creating drud_default network on restart.
 - Fixed linking issue where relative links started with two forward slashes.
-- Colorize output of `drud secret` comands.
+- Colorize output of `drud secret` commands.
 - Added a `drud file delete` command.
 - Added a `drud secret search` command.
 - Added experimental support for startup hooks provided by https://github.com/drud/dcfg.
diff --git a/cmd/config_test.go b/cmd/config_test.go
index 8fa51a07e16..a7767e089cc 100644
--- a/cmd/config_test.go
+++ b/cmd/config_test.go
@@ -19,7 +19,7 @@ var configTest = []struct {
 }{
 	{utils.RandomString(10) + ".yaml", "drudio", "production", "snuffleupagus", "drudapi.turtleduck.drud.io", "http"},
 	{utils.RandomString(10) + ".yaml", "nonsense", "staging", "barney", "drudapi.bowbell.drud.io", "https"},
-	{utils.RandomString(10) + ".yaml", "balogna", "default", "bigbird", "drudapi.genesis.drud.io", "https"},
+	{utils.RandomString(10) + ".yaml", "bologna", "default", "bigbird", "drudapi.genesis.drud.io", "https"},
 }
 
 // TestIntegrationConfigCreate makes sure that when a config does not exist one will be created
@@ -67,7 +67,7 @@ func TestIntegrationConfigSet(t *testing.T) {
 	}
 }
 
-// TestUnitConfigSet uses internal functions to test teh config set operation
+// TestUnitConfigSet uses internal functions to test the config set operation
 func TestUnitConfigSet(t *testing.T) {
 	var err error
 
diff --git a/cmd/legacy_restart.go b/cmd/legacy_restart.go
index 15d31af8773..36fff77d5bf 100644
--- a/cmd/legacy_restart.go
+++ b/cmd/legacy_restart.go
@@ -28,7 +28,7 @@ var LegacyReconfigCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if activeApp == "" {
-			log.Fatalln("Must set app flag to dentoe which app you want to work with.")
+			log.Fatalln("Must set app flag to denote which app you want to work with.")
 		}
 
 		app := local.NewLegacyApp(activeApp, activeDeploy)
diff --git a/cmd/legacy_workon.go b/cmd/legacy_workon.go
index 0f9d39144c5..e40c2127a91 100644
--- a/cmd/legacy_workon.go
+++ b/cmd/legacy_workon.go
@@ -16,7 +16,7 @@ import (
 var LegacyWorkonCmd = &cobra.Command{
 	Use:   "workon",
 	Short: "Set a site to work on",
-	Long:  `If you select an app to workon you cant skip the acticeApp and activeDeploy args.`,
+	Long:  `If you select an app to workon you cant skip the activeApp and activeDeploy args.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		var parts []string
 		var answer int
diff --git a/cmd/local_add.go b/cmd/local_add.go
index d058307f1db..1cb5809394e 100644
--- a/cmd/local_add.go
+++ b/cmd/local_add.go
@@ -144,7 +144,7 @@ var addCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		// get deploy that hasd the passed in name
+		// get deploy that has the passed in name
 		deploy := app.GetDeploy(args[1])
 		if deploy == nil {
 			log.Fatalln("Deploy", args[1], "does not exist.")
@@ -164,7 +164,7 @@ var addCmd = &cobra.Command{
 			deploy,
 		)
 
-		// Gather data, files, src resoruces in parallel
+		// Gather data, files, src resources in parallel
 
 		// limit logical processors to 3
 		runtime.GOMAXPROCS(3)
@@ -252,7 +252,7 @@ var addCmd = &cobra.Command{
 			log.Fatalln(dcErr)
 		}
 
-		// use the docker client to wait for the containers to spin up then print a linik to the app
+		// use the docker client to wait for the containers to spin up then print a link to the app
 		client, _ := utils.GetDockerClient()
 		var publicPort int64
 	Loop:
diff --git a/cmd/local_exec.go b/cmd/local_exec.go
index ea1475c5dc0..fda82df7c01 100644
--- a/cmd/local_exec.go
+++ b/cmd/local_exec.go
@@ -38,7 +38,7 @@ var localExecCmd = &cobra.Command{
 		nameContainer := fmt.Sprintf("%s-%s-%s-%s", appClient, cfg.ActiveApp, cfg.ActiveDeploy, serviceType)
 
 		if !utils.IsRunning(nameContainer) {
-			log.Fatal("App not runnign locally. Try `drud local add`.")
+			log.Fatal("App not running locally. Try `drud local add`.")
 		}
 
 		composeLOC := path.Join(basePath, "docker-compose.yaml")
diff --git a/cmd/local_ssh.go b/cmd/local_ssh.go
index 5cafe9aa855..2ab5831cc3b 100644
--- a/cmd/local_ssh.go
+++ b/cmd/local_ssh.go
@@ -31,7 +31,7 @@ var localSSHCmd = &cobra.Command{
 		nameContainer := fmt.Sprintf("%s-%s-%s-%s", appClient, cfg.ActiveApp, cfg.ActiveDeploy, serviceType)
 
 		if !utils.IsRunning(nameContainer) {
-			log.Fatal("App not runnign locally. Try `drud local add`.")
+			log.Fatal("App not running locally. Try `drud local add`.")
 		}
 
 		composeLOC := path.Join(basePath, "docker-compose.yaml")
diff --git a/cmd/root.go b/cmd/root.go
index ff7cf12897c..fab09f4a008 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -81,7 +81,7 @@ func Execute() {
 		}
 	}
 
-	// prepopulate tokenfile so i dont have to check for its existence everywhere
+	// prepopulate tokenfile so I don't have to check for its existence everywhere
 	if _, err := os.Stat(tokenLocation); os.IsNotExist(err) {
 		f, ferr := os.Create(tokenLocation)
 		if ferr != nil {
diff --git a/cmd/utils.go b/cmd/utils.go
index 812195c11bc..81cf94547e1 100644
--- a/cmd/utils.go
+++ b/cmd/utils.go
@@ -71,7 +71,7 @@ func posString(slice []string, element string) int {
 	return -1
 }
 
-// containsString returns true iff slice contains element
+// containsString returns true if slice contains element
 func containsString(slice []string, element string) bool {
 	return !(posString(slice, element) == -1)
 }
@@ -246,7 +246,7 @@ func getMAC() (string, error) {
 	return macADDR, nil
 }
 
-// ParseConfigFlag is needed in order to get teh value of the flag before cobra can
+// ParseConfigFlag is needed in order to get the value of the flag before cobra can
 func ParseConfigFlag() string {
 	value := ""
 
diff --git a/cms/config/wordpress.go b/cms/config/wordpress.go
index 277cfae709f..d689b65c759 100644
--- a/cms/config/wordpress.go
+++ b/cms/config/wordpress.go
@@ -26,7 +26,7 @@ if ( ! defined( 'DB_HOST' ) )
     define( 'DB_HOST', "{{ $config.DatabaseHost }}" );
 
 // ======================================================
-// Additonal DB settings, you do not want to change these
+// Additional DB settings, you do not want to change these
 // ======================================================
 if (file_exists(__DIR__ . '/custom.settings.php')) {
   include __DIR__ . '/custom.settings.php';
@@ -162,7 +162,7 @@ if ( !defined( 'DISALLOW_FILE_MODS' ) ) // updates
 
 // =====================================
 // WP - Core only updates the core files
-// No Akisemet or Hello Dolly
+// No Akismet or Hello Dolly
 // =====================================
 if ( !defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) )
   define( 'CORE_UPGRADE_SKIP_NEW_BUNDLED', true );
@@ -183,7 +183,7 @@ if ( file_exists( dirname( __FILE__ ) . '/memcached.php' ) )
   $memcached_servers = include( dirname( __FILE__ ) . '/memcached.php' );
 
 // ===========================================================================================
-// This can be used to programatically set the stage when deploying (e.g. production, staging)
+// This can be used to programmatically set the stage when deploying (e.g. production, staging)
 // ===========================================================================================
 define( 'WP_STAGE', 'xxxx' );
 define( 'STAGING_DOMAIN', 'xxxx' ); // Does magic in WP Stack to handle staging domain rewriting
diff --git a/docs/drud_get_file.md b/docs/drud_get_file.md
index 48d0d72d87b..a9199c559c4 100644
--- a/docs/drud_get_file.md
+++ b/docs/drud_get_file.md
@@ -5,7 +5,7 @@ Download a file stored in Drud.
 ### Synopsis
 
 
-Downlload a file stored remotely in the Drud system to your local system.
+Download a file stored remotely in the Drud system to your local system.
 
 ```
 drud get file [/path/to/filename]
diff --git a/docs/drud_init.md b/docs/drud_init.md
index 4c54eec7779..41f0fb7a96c 100644
--- a/docs/drud_init.md
+++ b/docs/drud_init.md
@@ -20,6 +20,6 @@ drud init
 
 ### SEE ALSO
 * [drud](drud.md)	 - A CLI for interacting with Drud.
-* [drud init local](drud_init_local.md)	 - Initialize machien for local development.
+* [drud init local](drud_init_local.md)	 - Initialize machine for local development.
 
 ###### Auto generated by spf13/cobra on 16-Feb-2016
diff --git a/docs/drud_init_local.md b/docs/drud_init_local.md
index 7d99ba12050..c8b802761d4 100644
--- a/docs/drud_init_local.md
+++ b/docs/drud_init_local.md
@@ -1,11 +1,11 @@
 ## drud init local
 
-Initialize machien for local development.
+Initialize machine for local development.
 
 ### Synopsis
 
 
-Ensures machine has requirements and setup for workign with Drud appls locally.
+Ensures machine has requirements and setup for working with Drud applications locally.
 
 ```
 drud init local
diff --git a/docs/drud_list_applications_types.md b/docs/drud_list_applications_types.md
index 4a2c4ce15f3..bcfbabac44f 100644
--- a/docs/drud_list_applications_types.md
+++ b/docs/drud_list_applications_types.md
@@ -5,7 +5,7 @@ List application types.
 ### Synopsis
 
 
-List the application tempaltes that have been created for your use.
+List the application templates that have been created for your use.
 
 ```
 drud list applications types
diff --git a/docs/drud_put_file.md b/docs/drud_put_file.md
index 76a1b9e6f9f..a463644372a 100644
--- a/docs/drud_put_file.md
+++ b/docs/drud_put_file.md
@@ -5,7 +5,7 @@ Upload a file to the Drud file storage system.
 ### Synopsis
 
 
-Push a file to yor org's storage space in the Drud system.
+Push a file to your organizations storage space in the Drud system.
 
 ```
 drud put file [/path/to/filename] [optional remote dest]
diff --git a/local/databags.go b/local/databags.go
index dfb29e88e46..acb0cbaed9e 100644
--- a/local/databags.go
+++ b/local/databags.go
@@ -72,7 +72,7 @@ func (d Databag) GetRepoDetails(env string) (RepoDetails, error) {
 	return details, nil
 }
 
-// SiteEnv models the iner contents of a databag
+// SiteEnv models the inner contents of a databag
 type SiteEnv struct {
 	ActiveTheme        string   `yaml:"active_theme"`
 	AdminMail          string   `yaml:"admin_mail"`
diff --git a/local/legacy.go b/local/legacy.go
index e91485c4a4e..1c9fe7ed0c3 100644
--- a/local/legacy.go
+++ b/local/legacy.go
@@ -62,7 +62,7 @@ func NewLegacyApp(name string, environment string) *LegacyApp {
 	}
 }
 
-// RenderComposeYAML returns teh contents of a docker compose config for this app
+// RenderComposeYAML returns the contents of a docker compose config for this app
 func (l LegacyApp) RenderComposeYAML() (string, error) {
 	var doc bytes.Buffer
 	var err error
@@ -118,7 +118,7 @@ func (l LegacyApp) ComposeFileExists() bool {
 	return true
 }
 
-// AbsPath returnt he full path from root to the app directory
+// AbsPath return the full path from root to the app directory
 func (l LegacyApp) AbsPath() string {
 	homedir, err := utils.GetHomeDir()
 	if err != nil {
@@ -417,7 +417,7 @@ func (l *LegacyApp) FindPorts() error {
 	return err
 }
 
-// Config creates the apps config file adding thigns like database host, name, and password
+// Config creates the apps config file adding things like database host, name, and password
 // as well as other sensitive data like salts.
 func (l *LegacyApp) Config() error {
 	basePath := l.AbsPath()
@@ -534,7 +534,7 @@ func (l *LegacyApp) Cleanup() error {
 				args := []string{action, c.ID}
 				_, err := utils.RunCommand("docker", args)
 				if err != nil {
-					return fmt.Errorf("Could nnot %s container %s: %s", action, c.Names[0], err)
+					return fmt.Errorf("Could not %s container %s: %s", action, c.Names[0], err)
 				}
 			}
 		}
diff --git a/local/types.go b/local/types.go
index 455847a1856..465c927c283 100644
--- a/local/types.go
+++ b/local/types.go
@@ -7,9 +7,9 @@ import (
 
 // App is an interface apps for Drud Local must implement to use shared functionality
 type App interface {
-	RenderComposeYAML() (string, error)   // returns contents for docke rcompose config
+	RenderComposeYAML() (string, error)   // returns contents for docker compose config
 	RelPath() string                      // returns path from root dir ('$HOME/.drud') to app
-	GetRepoDetails() (RepoDetails, error) // retuirns struct with branch, org, host, etc...
+	GetRepoDetails() (RepoDetails, error) // returns struct with branch, org, host, etc...
 	ContainerName() string
 	AbsPath() string
 	GetName() string