msg template and corrected urls
merge