fixed minor errors and buffered Shortcode content output