shortcode extend done! will update from user feedback :p