diff --git a/pwiki/page.js b/pwiki/page.js
index d2701e2..f865d8b 100755
--- a/pwiki/page.js
+++ b/pwiki/page.js
@@ -1231,8 +1231,8 @@ module.System = {
 	// XXX not sure if this is the right way to go...
 	_code: {
 		text: '<pre wikiwords="no"><quote filter="quote-tags" src="."/></pre>' },
-	//_edit: {
 	_ed: {
+	//_edit: {
 		text: 
 			'<pre class="editor" '
 					+'wikiwords="no" '
@@ -1316,7 +1316,7 @@ module.Settings = {
 	Export: {
 		text: '<button onclick="exportData()">Export</button>' },
 	// XXX
-	Settings: {
+	Config: {
 		text: '{}' },
 }
 
diff --git a/pwiki/parser.js b/pwiki/parser.js
index 1dff8c9..d36923c 100755
--- a/pwiki/parser.js
+++ b/pwiki/parser.js
@@ -118,10 +118,10 @@ module.BaseParser = {
 	// XXX do we need basic inline and block commets a-la lisp???
 	COMMENT_PATTERN: RegExp('('+[
 			// <!--[pwiki[ .. ]]-->
-			'<!--\\[pwiki\\[(?<uncomment>.*)\\]\\]-->',
+			'<!--\\[pwiki\\[(?<uncomment>.*?)\\]\\]-->',
 
 			// <pwiki-comment> .. </pwiki-comment>
-			'<\\s*pwiki-comment[^>]*>.*<\\/\\s*pwiki-comment\\s*>',
+			'<\\s*pwiki-comment[^>]*>.*?<\\/\\s*pwiki-comment\\s*>',
 			// <pwiki-comment .. />
 			'<\\s*pwiki-comment[^\\/>]*\\/>',
 		].join('|') +')', 'smig'),
diff --git a/pwiki2-test.js b/pwiki2-test.js
index c43a2e9..33345cc 100755
--- a/pwiki2-test.js
+++ b/pwiki2-test.js
@@ -58,6 +58,20 @@ pwiki.store.update('@pouch', {
 // XXX TEST...
 // XXX add filter tests...
 pwiki.pwiki
+	.update({
+		location: '/test/comments',
+		text: object.doc`
+		<!--[pWiki[ This text should be visible... ]]-->
+
+		<!--[pWiki[
+			This text should be visible too... 
+		]]-->
+
+		<pwiki-comment>
+			And this should not be visible...
+		</pwiki-comment>
+		`,
+	})
 	.update({
 		location: '/test/test',
 		text: 'test', })