Updates to DEBUG and Shortcodes. Rebase with your changes