New shortcodes.
Correct callbacks.
New shortcode and bug fixes.