diff --git a/src/org/exporter.rs b/src/org/exporter.rs
index 53d2e62..cd634e4 100644
--- a/src/org/exporter.rs
+++ b/src/org/exporter.rs
@@ -92,7 +92,7 @@ impl OrgHtmlExporter {
 impl Traverser for OrgHtmlExporter {
     fn event(&mut self, event: Event, ctx: &mut TraversalContext) {
         match event {
-            Event::Enter(Container::Document(_)) => self.output += "<main>\n",
+            Event::Enter(Container::Document(_)) => self.output += "<main class=\"container\">\n",
             Event::Leave(Container::Document(_)) => self.output += "</main>\n",
 
             Event::Enter(Container::Headline(headline)) => {
@@ -311,6 +311,7 @@ impl Traverser for OrgHtmlExporter {
                     .parent()
                     .is_some_and(|parent| match parent.kind() {
                         SyntaxKind::KEYWORD
+                        | SyntaxKind::SPECIAL_BLOCK
                         | SyntaxKind::DYN_BLOCK
                         | SyntaxKind::DRAWER
                         | SyntaxKind::DRAWER_END
@@ -321,7 +322,10 @@ impl Traverser for OrgHtmlExporter {
                 {
                     ()
                 } else {
-                    let _ = write!(&mut self.output, "{}", HtmlEscape(text));
+                    // END section seems to get through parser
+                    if !text.contains("#+END") {
+                        let _ = write!(&mut self.output, "{}", HtmlEscape(text));
+                    }
                 }
             }