Fixed instruction to show proper shortcode
Cleaning up @todo messages