Removed unneccessary panics.  Updated URI constants.