shortcode updates

I have finished putting in the shortcode.