diff --git a/org/drawer.go b/org/drawer.go
index bf2b7ae..7010ce8 100644
--- a/org/drawer.go
+++ b/org/drawer.go
@@ -37,7 +37,7 @@ func (d *Document) parseDrawer(i int, parentStop stopFn) (int, Node) {
 		i += consumed
 		drawer.Children = append(drawer.Children, nodes...)
 		if i < len(d.tokens) && d.tokens[i].kind == "beginDrawer" {
-			p := Paragraph{[]Node{Text{d.tokens[i].content, false}}}
+			p := Paragraph{[]Node{Text{":" + d.tokens[i].content + ":", false}}}
 			drawer.Children = append(drawer.Children, p)
 			i++
 		} else {
diff --git a/org/org.go b/org/org.go
index 070eedc..0e32898 100644
--- a/org/org.go
+++ b/org/org.go
@@ -117,12 +117,11 @@ func (w *OrgWriter) writeHeadline(h Headline) {
 	tmp.writeNodes(h.Title...)
 	hString := tmp.String()
 	if len(h.Tags) != 0 {
-		hString += " "
 		tString := ":" + strings.Join(h.Tags, ":") + ":"
 		if n := w.TagsColumn - len(tString) - len(hString); n > 0 {
 			w.WriteString(hString + strings.Repeat(" ", n) + tString)
 		} else {
-			w.WriteString(hString + tString)
+			w.WriteString(hString + " " + tString)
 		}
 	} else {
 		w.WriteString(hString)
@@ -142,8 +141,14 @@ func (w *OrgWriter) writeBlock(b Block) {
 	if len(b.Parameters) != 0 {
 		w.WriteString(" " + strings.Join(b.Parameters, " "))
 	}
-	w.WriteString("\n" + w.indent)
+	w.WriteString("\n")
+	if isRawTextBlock(b.Name) {
+		w.WriteString(w.indent)
+	}
 	w.writeNodes(b.Children...)
+	if !isRawTextBlock(b.Name) {
+		w.WriteString(w.indent)
+	}
 	w.WriteString("#+END_" + b.Name + "\n")
 }
 
@@ -178,7 +183,11 @@ func (w *OrgWriter) writeExample(e Example) {
 }
 
 func (w *OrgWriter) writeKeyword(k Keyword) {
-	w.WriteString(w.indent + fmt.Sprintf("#+%s: %s\n", k.Key, k.Value))
+	w.WriteString(w.indent + "#+" + k.Key + ":")
+	if k.Value != "" {
+		w.WriteString(" " + k.Value)
+	}
+	w.WriteString("\n")
 }
 
 func (w *OrgWriter) writeNodeWithMeta(n NodeWithMeta) {
@@ -195,7 +204,7 @@ func (w *OrgWriter) writeNodeWithMeta(n NodeWithMeta) {
 }
 
 func (w *OrgWriter) writeComment(c Comment) {
-	w.WriteString(w.indent + "#" + c.Content)
+	w.WriteString(w.indent + "#" + c.Content + "\n")
 }
 
 func (w *OrgWriter) writeList(l List) { w.writeNodes(l.Items...) }
diff --git a/org/testdata/blocks.html b/org/testdata/blocks.html
index a5d7a23..d4001e8 100644
--- a/org/testdata/blocks.html
+++ b/org/testdata/blocks.html
@@ -28,7 +28,9 @@ empty lines!
 
 it also has multiple parameters
 
-note that /inline/ *markup* ignored
+src, example & export blocks treat their content as raw text
+/inline/ *markup* is ignored
+      and whitespace is honored and not removed
 </pre>
 <pre class="example">
 examples like this
@@ -40,7 +42,7 @@ note that /inline/ *markup* ignored
 Mongodb is <strong>webscale</strong>. (source: <a href="http://www.mongodb-is-web-scale.com/">mongodb-is-web-scale</a>)
 </p>
 <p>
-blocks can contain other elements like
+blocks like the quote block parse their content and can contain
 </p>
 <ul>
 <li>
@@ -82,6 +84,10 @@ paragraphs
 </p>
 </li>
 </ul>
+<p>
+also whitespace is not significant
+and superfluous whitespace (at the beginning of the line) is removed
+</p>
 </blockquote>
 <script>
 console.log("Hello World!")
@@ -95,6 +101,11 @@ blocks can contain unindented lines that would normally end a list item
 <pre class="example">
 this line is not indented - if it was outside of a block the list item would end
 </pre>
+<blockquote>
+<p>
+this line is not indented - if it was outside of a block the list item would end
+</p>
+</blockquote>
 <p>
 now we&#39;re outside the block again and the following unindented line will be outside of the list item
 </p>
diff --git a/org/testdata/blocks.org b/org/testdata/blocks.org
index 374c0a0..5113453 100644
--- a/org/testdata/blocks.org
+++ b/org/testdata/blocks.org
@@ -22,7 +22,9 @@ empty lines!
 
 it also has multiple parameters
 
-note that /inline/ *markup* ignored
+src, example & export blocks treat their content as raw text
+/inline/ *markup* is ignored
+      and whitespace is honored and not removed
 #+END_EXAMPLE
 
 : examples like this
@@ -32,7 +34,7 @@ note that /inline/ *markup* ignored
 #+BEGIN_QUOTE
 Mongodb is *webscale*. (source: [[http://www.mongodb-is-web-scale.com/][mongodb-is-web-scale]])
 
-blocks can contain other elements like
+blocks like the quote block parse their content and can contain
 - lists
 - inline /markup/
 - tables
@@ -41,6 +43,10 @@ blocks can contain other elements like
   | baz |
 - paragraphs
 - ...
+
+
+      also whitespace is not significant
+            and superfluous whitespace (at the beginning of the line) is removed
 #+END_QUOTE
 
 #+BEGIN_EXPORT html
@@ -54,6 +60,9 @@ console.log("Hello World!")
   #+BEGIN_EXAMPLE
 this line is not indented - if it was outside of a block the list item would end
   #+END_EXAMPLE
+  #+BEGIN_QUOTE
+this line is not indented - if it was outside of a block the list item would end
+  #+END_QUOTE
   now we're outside the block again and the following unindented line will be outside of the list item
 this unindented line is outside of the list item
 - list item 2
diff --git a/org/testdata/blocks.pretty_org b/org/testdata/blocks.pretty_org
index f32ba8e..957f276 100644
--- a/org/testdata/blocks.pretty_org
+++ b/org/testdata/blocks.pretty_org
@@ -22,7 +22,9 @@ empty lines!
 
 it also has multiple parameters
 
-note that /inline/ *markup* ignored
+src, example & export blocks treat their content as raw text
+/inline/ *markup* is ignored
+      and whitespace is honored and not removed
 #+END_EXAMPLE
 
 : examples like this
@@ -32,7 +34,7 @@ note that /inline/ *markup* ignored
 #+BEGIN_QUOTE
 Mongodb is *webscale*. (source: [[http://www.mongodb-is-web-scale.com/][mongodb-is-web-scale]])
 
-blocks can contain other elements like
+blocks like the quote block parse their content and can contain
 - lists
 - inline /markup/
 - tables
@@ -41,6 +43,10 @@ blocks can contain other elements like
   | baz |
 - paragraphs
 - ...
+
+
+also whitespace is not significant
+and superfluous whitespace (at the beginning of the line) is removed
 #+END_QUOTE
 
 #+BEGIN_EXPORT html
@@ -54,6 +60,9 @@ console.log("Hello World!")
   #+BEGIN_EXAMPLE
   this line is not indented - if it was outside of a block the list item would end
   #+END_EXAMPLE
+  #+BEGIN_QUOTE
+  this line is not indented - if it was outside of a block the list item would end
+  #+END_QUOTE
   now we're outside the block again and the following unindented line will be outside of the list item
 this unindented line is outside of the list item
 - list item 2