diff --git a/ponysay-tool.py b/ponysay-tool.py
index dfa39b41..36e81d52 100755
--- a/ponysay-tool.py
+++ b/ponysay-tool.py
@@ -607,7 +607,7 @@ class PonysayTool():
                         for c in 'ABCDEFGHIJKLMN OPQRSTUVWXYZ':
                             test = test.replace(c, '')
                         if (len(test) == 0) and (len(key) > 0):
-                            data.append((key, makeset(value)))
+                            data.append((key, makeset(value.replace(' ', ''))))
                 everything.append(ponyfile[:-5], data)
         import cPickle
         with open(ponydir + 'metadata', 'wb') as file:
@@ -758,7 +758,9 @@ class PonysayTool():
                     comment = ('\n' + comment + '\n').replace('\n$$$\n', '\n\\$$$\n')[:-1]
                     
                     meta = []
-                    for key in self.data:
+                    keys = [key for key in data]
+                    keys.sort()
+                    for key in keys:
                         if (key == 'comment') or (len(self.data[key].strip()) == 0):
                             continue
                         values = self.data[key].strip()
@@ -767,6 +769,7 @@ class PonysayTool():
                     
                     meta.append('WIDTH: ' + str(self.ponywidth))
                     meta.append('HEIGHT: ' + str(self.ponyheight))
+                    # TODO auto fill in BALLOON {TOP,BOTTOM}
                     meta.append(comment)
                     meta = '\n'.join(meta)
                     ponydata = '$$$\n' + meta + '\n$$$\n' + '\n'.join(self.image)
@@ -784,7 +787,7 @@ class PonysayTool():
 '''
 GNU Emacs alike text area
 '''
-class TextArea:
+class TextArea: # TODO support small screens
     '''
     Constructor
     
diff --git a/ponysay.py b/ponysay.py
index dabc86aa..da671633 100755
--- a/ponysay.py
+++ b/ponysay.py
@@ -631,7 +631,7 @@ class Ponysay():
         table = [(get_test(cell[:cell.index('=')],
                            cell[cell.index('=') + 1:]
                           )
-                  for cell in clause.lower().split('+'))
+                  for cell in clause.lower().replace('_', '').replace(' ', '').split('+'))
                   for clause in restriction
                 ]