diff --git a/image_creator/disk.py b/image_creator/disk.py
index 71c7f17a81e27050ddb1e90f85c196ab8cf99bf4..287921ac4f02211c81645f5fc20f7b60a33f58b9 100644
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -202,7 +202,7 @@ class DiskDevice(object):
         self.root = roots[0]
         self.ostype = self.g.inspect_get_type(self.root)
         self.distro = self.g.inspect_get_distro(self.root)
-        success('found a %s system' % self.distro)
+        success('found a(n) %s system' % self.distro)
 
     def destroy(self):
         """Destroy this DiskDevice instance."""
diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 56fd3829ce7376dfc676fc5862c64f660f1cd4b5..ffe0158bf553374a3877c2a5f1824e1bb6a84424 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -80,7 +80,7 @@ class Kamaki:
         self.uploaded_object = None
 
     def upload(self, file_obj, size=None, remote_path=None, hp=None, up=None):
-
+        """Upload a file to pithos"""
         if remote_path is None:
             remote_path = basename(filename)
 
@@ -101,7 +101,7 @@ class Kamaki:
             raise FatalError("Pithos client: %d %s" % (e.status, e.message))
 
     def register(self, name, location, metadata):
-
+        """Register an image to ~okeanos"""
         params = {'is_public': 'true', 'disk_format': 'diskdump'}
         try:
             self.image_client.register(name, location, params, metadata)
diff --git a/image_creator/main.py b/image_creator/main.py
index 86b74ccf181a1b437df6b28a0d2aa152f6da0671..4a289c5ec1377edb1da65b38332ff343280ade3e 100755
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -240,7 +240,7 @@ def image_creator():
             output()
 
         if options.register:
-            output('Registing image to ~okeanos...', False)
+            output('Registring image to ~okeanos...', False)
             kamaki.register(options.register, uploaded_obj, metadata)
             success('done')
             output()