Shortcoder features add & fixes