diff --git a/BUGS b/BUGS
index 5d81551..3085cfa 100644
--- a/BUGS
+++ b/BUGS
@@ -19,6 +19,18 @@
 
     3. headers work poorly with some indenting schemes.
 
+    4. auto-wrap in mutt mode needs to not break on ">" quoting.
+       auto-wrap in perl mode needs to handle POD
+       auto-wrap in general should be able to handle line comments
+
+    5. comment/uncomment need to do the right thing on empty lines
+       (which is... adding indentation to pad the comment correctly, and
+        then remove indentation on empty lines once the comment is removed)
+
+    6. comment/uncomment should only remove the "lowest amount" of commenting
+       (e.g. if all lines have "##" then remove both, if most have "#" but one
+        has "##" then that one should still be commented after).
+
 2009/06/04:
     change the mode-detection order--using the "in-file" override should be
     able to override a positive match on file extension, filename, etc.