diff --git a/README.md b/README.md
index 3ea8dfb..0615ba5 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Wanted: Themes! If you have a cool theme, simply open an issue on the bug tracke
  * Add page history somehow
  * Allow users to change their passwords
  * Add auto updating system that doesn't wipe your settings
- * Add page deletion mechanism
- * .... (open an issue if you have any suggestions)
+ * Make links to non existant pages red
+ * .... (open an issue if you have any suggestions!)
 
 --Starbeamrainbowlabs
diff --git a/core.php b/core.php
index 4f1f68b..1ee38ea 100644
--- a/core.php
+++ b/core.php
@@ -232,7 +232,7 @@ function renderpage($title, $content, $minimal = false)
 ////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////// Slimdown /////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////// %slimdown% //
 ////////////////////////////////////////////////////////////////////////////////////////////
 /**
  * Slimdown - A very basic regex-based Markdown parser. Supports the
@@ -275,7 +275,7 @@ class Slimdown {
 		'/\~\~(.*?)\~\~/' => '<del>\1</del>',						// del
 		'/\:\"(.*?)\"\:/' => '<q>\1</q>',							// quote
 		'/`(.*?)`/' => '<code>\1</code>',							// inline code
-		'/\n\*(.*)/' => 'self::ul_list',							// ul lists
+		'/\n\s*(\*|-)(.*)/' => 'self::ul_list',							// ul lists
 		'/\n[0-9]+\.(.*)/' => 'self::ol_list',						// ol lists
 		'/\n(&gt;|\>)(.*)/' => 'self::blockquote',					// blockquotes
 		'/\n-{3,}/' => "\n<hr />",									// horizontal rule
@@ -293,7 +293,7 @@ class Slimdown {
 		return sprintf ("\n<p>%s</p>\n", $trimmed);
 	}
 	private static function ul_list ($regs) {
-		$item = $regs[1];
+		$item = $regs[2];
 		return sprintf ("\n<ul>\n\t<li>%s</li>\n</ul>", trim($item));
 	}
 	private static function ol_list ($regs) {
diff --git a/index.php b/index.php
index 76ea895..47605ba 100755
--- a/index.php
+++ b/index.php
@@ -347,7 +347,7 @@ function renderpage($title, $content, $minimal = false)
 ////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////// Slimdown /////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////// %slimdown% //
 ////////////////////////////////////////////////////////////////////////////////////////////
 /**
  * Slimdown - A very basic regex-based Markdown parser. Supports the
@@ -390,7 +390,7 @@ class Slimdown {
 		'/\~\~(.*?)\~\~/' => '<del>\1</del>',						// del
 		'/\:\"(.*?)\"\:/' => '<q>\1</q>',							// quote
 		'/`(.*?)`/' => '<code>\1</code>',							// inline code
-		'/\n\*(.*)/' => 'self::ul_list',							// ul lists
+		'/\n\s*(\*|-)(.*)/' => 'self::ul_list',							// ul lists
 		'/\n[0-9]+\.(.*)/' => 'self::ol_list',						// ol lists
 		'/\n(&gt;|\>)(.*)/' => 'self::blockquote',					// blockquotes
 		'/\n-{3,}/' => "\n<hr />",									// horizontal rule
@@ -408,7 +408,7 @@ class Slimdown {
 		return sprintf ("\n<p>%s</p>\n", $trimmed);
 	}
 	private static function ul_list ($regs) {
-		$item = $regs[1];
+		$item = $regs[2];
 		return sprintf ("\n<ul>\n\t<li>%s</li>\n</ul>", trim($item));
 	}
 	private static function ol_list ($regs) {