diff --git a/engine/org2gemini.sh b/engine/org2gemini.sh
index 6b51e40..b8c7911 100755
--- a/engine/org2gemini.sh
+++ b/engine/org2gemini.sh
@@ -2,8 +2,7 @@
 
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
-
 src="$1"
 dst="$2"
 
-./engine/org2gemini_step1.sh "$src" | perl -pe 's#\[\[([^]]*)\]\[([^]]*)\]\]#\n=> $1 $2#g;s#\* ##;s#=> file:#=> #g' > "$dst"
+./engine/org2gemini_step1.sh "$src" | perl -pe 's#\[\[([^]]*)\]\[([^]]*)\]\]#\n=> $1 $2#g;s#^\* *$##;s#=> file:#=> #g' > "$dst"
diff --git a/engine/org2gemini_step1.sh b/engine/org2gemini_step1.sh
index 79658bf..10c68ed 100755
--- a/engine/org2gemini_step1.sh
+++ b/engine/org2gemini_step1.sh
@@ -4,8 +4,9 @@ BEGIN { IGNORECASE=1; }
 
 { skip=0; }
 
-/^#+(BEGIN|END)_SRC / { gsub(/(BEGIN|END)_SRC /,"```"); }
+/^#+(BEGIN|END)_SRC /i { gsub(/#+(BEGIN|END)_SRC /,"```"); }
 /^#\+TITLE: / { gsub(/^#[^:]*: /,"# "); }
+/^ *:[a-zA-Z_0-9]*:/ { skip=1; }
 /^\* / { gsub(/^\* /,"# "); }
 /^\*\* / { gsub(/^\*\* /,"## "); }
 /^\*\*\* / { gsub(/^\*\*\* /,"### "); }