some shortcode improvements