Made metadata extraction check for valid value as well as just being set
Added a few new shortcode options and some examples