fixed and improved many things in shortcode generator