Added Blockquotes and More cleanup