diff --git a/mozilla/webtools/addons/public/tpl/addcomment.tpl b/mozilla/webtools/addons/public/tpl/addcomment.tpl
index 753a3504d74..029d7c50736 100644
--- a/mozilla/webtools/addons/public/tpl/addcomment.tpl
+++ b/mozilla/webtools/addons/public/tpl/addcomment.tpl
@@ -11,7 +11,7 @@ released on {$addon->VersionDateAdded|date_format}
 </p>
 
 {if $c_added_comment}
-<p>You comment has been added successfully.</p>
+<p>Your comment has been added successfully.</p>
 <ul>
 <li><a href="addon.php?id={$addon->ID}">Return to {$addon->Name|escape}</a></li>
 </ul>
diff --git a/mozilla/webtools/addons/public/tpl/addon.tpl b/mozilla/webtools/addons/public/tpl/addon.tpl
index 0fb212676ba..eca676b3af4 100644
--- a/mozilla/webtools/addons/public/tpl/addon.tpl
+++ b/mozilla/webtools/addons/public/tpl/addon.tpl
@@ -90,7 +90,7 @@ Works with:
 
 {if $addon->devcomments}
 <h2>Developer Comments</h2>
-<p>{$addon->devcomments|nl2br}</p>
+<p>{$addon->devcomments|nl2br|strip_tags}</p>
 {/if}
 
 <h3 id="user-comments">User Comments</h3>
@@ -101,9 +101,9 @@ Works with:
 {section name=comments loop=$addon->Comments max=10}
 <li>
 <div class="opinions-vote">{$addon->Comments[comments].CommentVote} <span class="opinions-caption">out of 5</span></div>
-<h4 class="opinions-title">{$addon->Comments[comments].CommentTitle}</h4>
-<p class="opinions-info">by {$addon->Comments[comments].CommentName}, {$addon->Comments[comments].CommentDate|date_format}</p>
-<p class="opinions-text">{$addon->Comments[comments].CommentNote}</p>
+<h4 class="opinions-title">{$addon->Comments[comments].CommentTitle|strip_tags}</h4>
+<p class="opinions-info">by {$addon->Comments[comments].CommentName|strip_tags}, {$addon->Comments[comments].CommentDate|date_format}</p>
+<p class="opinions-text">{$addon->Comments[comments].CommentNote|strip_tags}</p>
 <p class="opinions-helpful"><strong>{$addon->Comments[comments].helpful_yes}</strong> out of <strong>{$addon->Comments[comments].helpful_total}</strong> viewers found this comment helpful<br>
 Was this comment helpful? <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=yes&amp;app={$app}">Yes</a> &#124; <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=no&amp;app={$app}">No</a></p>
 </li>
@@ -124,7 +124,7 @@ Was this comment helpful? <a href="{$config.webpath}/ratecomment.php?aid={$addon
 <li>Last Updated: {$addon->DateUpdated|date_format}</li>
 <li>Total Downloads: {$addon->TotalDownloads} &nbsp;&#8212;&nbsp; Downloads this Week: {$addon->downloadcount}</li>
 <li>See <a href="{$config.webpath}/{$app}/{$addon->ID}/history/">all previous releases</a> of this addon.</li>
-{if $addon->UserWebsite}
+{if $addon->Homepage}
 <li>View the <a href="{$addon->Homepage}">Author's homepage</a> for this addon.</li>
 {/if}
 </ul>
diff --git a/mozilla/webtools/addons/public/tpl/comments.tpl b/mozilla/webtools/addons/public/tpl/comments.tpl
index 3a53bee088f..c6e89b040f3 100644
--- a/mozilla/webtools/addons/public/tpl/comments.tpl
+++ b/mozilla/webtools/addons/public/tpl/comments.tpl
@@ -54,9 +54,9 @@ Next Page &raquo;
 {section name=comments loop=$addon->Comments}
 <li>
 <div class="opinions-vote">{$addon->Comments[comments].CommentVote}<span class="opinions-caption">out of 5</span></div>
-<h4 class="opinions-title">{$addon->Comments[comments].CommentTitle}</h4>
-<p class="opinions-info">by {$addon->Comments[comments].CommentName}, {$addon->Comments[comments].CommentDate|date_format}</p>
-<p class="opinions-text">{$addon->Comments[comments].CommentNote}</p>
+<h4 class="opinions-title">{$addon->Comments[comments].CommentTitle|strip_tags}</h4>
+<p class="opinions-info">by {$addon->Comments[comments].CommentName|strip_tags}, {$addon->Comments[comments].CommentDate|date_format}</p>
+<p class="opinions-text">{$addon->Comments[comments].CommentNote|strip_tags}</p>
 <p class="opinions-helpful"><strong>{$addon->Comments[comments].helpful_yes}</strong> out of <strong>{$addon->Comments[comments].helpful_total}</strong> viewers found this comment helpful<br>
 Was this comment helpful? <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=yes">Yes</a> &#124; <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=no">No</a></p>
 </li>