diff --git a/CHANGELOG b/CHANGELOG
index b40655a..c69dc7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,10 @@
 0.5.0
 - SA 0.5.x support.
-- TODO:py.test is no longer used for testing.  (use nose)
+- py.test is no longer used for testing.  (use nose)
 - Added --echo=True option for all commands, which will make the sqlalchemy connection echo SQL statements.
 - Better Postgres support, especially for schemas.
 - modification to the downgrade command to simplify the calling (old way still works just fine)
+- TODO: complete MySQL support
 
 0.4.x
 - TODO: document changes
diff --git a/migrate/__init__.py b/migrate/__init__.py
index 3285e65..e69de29 100644
--- a/migrate/__init__.py
+++ b/migrate/__init__.py
@@ -1 +0,0 @@
-from migrate.run import *
diff --git a/migrate/changeset/databases/postgres.py b/migrate/changeset/databases/postgres.py
index 4fb23d5..8c907fd 100644
--- a/migrate/changeset/databases/postgres.py
+++ b/migrate/changeset/databases/postgres.py
@@ -11,19 +11,34 @@ class PGSchemaGeneratorMixin(object):
         return '"%s"'%identifier
 
 class PGColumnGenerator(PGSchemaGenerator,ansisql.ANSIColumnGenerator, PGSchemaGeneratorMixin):
-    pass
+    def _do_quote_table_identifier(self, identifier):
+        return identifier
+    def _do_quote_column_identifier(self, identifier):
+        return '"%s"'%identifier
 
 class PGColumnDropper(ansisql.ANSIColumnDropper, PGSchemaGeneratorMixin):
-    pass
+    def _do_quote_table_identifier(self, identifier):
+        return identifier
+    def _do_quote_column_identifier(self, identifier):
+        return '"%s"'%identifier
 
 class PGSchemaChanger(ansisql.ANSISchemaChanger, PGSchemaGeneratorMixin):
-    pass
+    def _do_quote_table_identifier(self, identifier):
+        return identifier
+    def _do_quote_column_identifier(self, identifier):
+        return '"%s"'%identifier
 
 class PGConstraintGenerator(ansisql.ANSIConstraintGenerator, PGSchemaGeneratorMixin):
-    pass
+    def _do_quote_table_identifier(self, identifier):
+        return identifier
+    def _do_quote_column_identifier(self, identifier):
+        return '"%s"'%identifier
 
 class PGConstraintDropper(ansisql.ANSIConstraintDropper, PGSchemaGeneratorMixin):
-    pass
+    def _do_quote_table_identifier(self, identifier):
+        return identifier
+    def _do_quote_column_identifier(self, identifier):
+        return '"%s"'%identifier
 
 class PGDialect(ansisql.ANSIDialect):
     columngenerator = PGColumnGenerator
diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py
index 229f3da..02c9fc9 100644
--- a/migrate/versioning/shell.py
+++ b/migrate/versioning/shell.py
@@ -92,7 +92,8 @@ def parse_args(*args,**kwargs):
         if cmdname == 'downgrade':
             if not args[-1].startswith('--'):
                 kwargs['version'] = args[-1]
-               
+                args = args[:-1]
+                
     except IndexError:
         # No command specified: no error message; just show usage
         raise ShellUsageError(None)