Fixed shortcodes and brought in more data for embedded quotes.