Adding shortcode, various bug fixes.