more "shortcode" edits