added some shortcode stuff and smut