More work on shortcodes