Fixed some minor bugs and added Shortcode Types

Added new Shortcode types to plugin