Fix bugs, breakout markdown into its own directive