diff --git a/source/stylesheets/library/_typography.sass b/source/stylesheets/library/_typography.sass
index e532f67..a1b5c63 100644
--- a/source/stylesheets/library/_typography.sass
+++ b/source/stylesheets/library/_typography.sass
@@ -72,6 +72,12 @@
     +dl-style(!font_size)
   blockquote
     +quote-style
+  q
+    font-style: italic
+    &:before
+      content: "\201C"
+    &:after
+      content: "\201D"
   em, dfn
     font-style: italic
   strong, dfn
@@ -97,6 +103,8 @@
   tt
     display: block
     margin= !font_size * 1.625 0
+  sub, sup
+    line-height: 0
   hr
     margin-bottom= !font_size * 1.625
   
diff --git a/source/typography.haml b/source/typography.haml
index 885758c..4f7c2e3 100644
--- a/source/typography.haml
+++ b/source/typography.haml
@@ -21,13 +21,21 @@ title: Typography Debug
   Aliquam arcu. Phasellus vulputate. Integer sem diam, mattis vel, viverra ullamcorper, ultricies quis, nisl. Sed
   sollicitudin quam ut nisi. Vivamus velit sapien, volutpat eu, faucibus id, nonummy id, urna.
 %p
+  Take it<sub>2</sub> to the power of<sup>3</sup>
   Praesent iaculis pellentesque est. Nulla facilisi. Etiam fringilla vehicula orci. Aliquam fermentum ipsum id
   nulla. Aliquam interdum laoreet leo. Cras accumsan. Nam pharetra diam id nunc. Integer blandit tellus vulputate
   felis. Cras aliquam, eros in euismod aliquam, enim nisl mollis metus, quis fringilla ipsum diam ut pede. Mauris a
   libero ac velit interdum pulvinar. Nunc ipsum mauris, semper rhoncus, feugiat ut, egestas id, diam. Nullam
   porttitor condimentum risus. Vivamus nec enim eget nisi commodo euismod. Ut turpis. Nullam malesuada rutrum
   neque. Nam sodales porta elit. Mauris mollis nisl vel augue.
+
+%p
+  And we were like <q>Woah</q>, and he was like <q>Woah</q>, and they were like <q>WOAH!</q>
+
+%p
   %abbr(title="For The Win!") FTW!
+%p
+  
 
 %h3 Unordered lists
 %ul