diff --git a/storage/migrations/S3v2.go b/storage/migrations/S3v2.go
index 640955e..2248960 100644
--- a/storage/migrations/S3v2.go
+++ b/storage/migrations/S3v2.go
@@ -18,7 +18,7 @@ package migrations
 // // from this:
 // //	short -> url
 // func MigrateS3FromV1ToV2(storage *storage.S3, writenew bool, deleteold bool) {
-// 	log.Println("Begining S3 migration from v1 design to v2")
+// 	log.Println("Beginning S3 migration from v1 design to v2")
 //
 // 	s3b := storage.Bucket
 //
diff --git a/storage/multistorage/multistorage_option.go b/storage/multistorage/multistorage_option.go
index 4f7a05d..cebece2 100644
--- a/storage/multistorage/multistorage_option.go
+++ b/storage/multistorage/multistorage_option.go
@@ -27,7 +27,7 @@ func SaveToAll() MultiStorageOption {
 	}
 }
 
-// SaveOnlyOnce causes the MultiStorage to try to save the short and url to all of the underlying stores, however it will return immidately if it has any successful saves. This will only report an error if all backends fail
+// SaveOnlyOnce causes the MultiStorage to try to save the short and url to all of the underlying stores, however it will return immediately if it has any successful saves. This will only report an error if all backends fail
 func SaveOnlyOnce() MultiStorageOption {
 	return func(m *MultiStorage) error {
 		m.saver = saveOnlyOnceFunc
diff --git a/storage/storage_test.go b/storage/storage_test.go
index 0ade6f3..f88fa86 100644
--- a/storage/storage_test.go
+++ b/storage/storage_test.go
@@ -140,7 +140,7 @@ func TestNamedStorageNormalization(t *testing.T) {
 }
 
 func TestMissingLoad(t *testing.T) {
-	testCode := "non-existant-short-string"
+	testCode := "non-existent-short-string"
 
 	for name, setupStorage := range storageSetups {
 		setupStorage := setupStorage