new dms_core stuff for testing
shortcode fixes