fix up shortcodes a bit