From f01a6aecb804f77b461f8348bf1d61cacf3bfca4 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Sun, 23 Sep 2012 08:00:25 +0000
Subject: [PATCH] Empty commit

---
 classes/class_templates.php          |  2 +-
 classes/class_torrent_form.php       | 28 ++++-----
 sections/artist/artist.php           | 32 +++++-----
 sections/artist/artist_rearrange.php | 44 +++++++-------
 sections/artist/change_artistid.php  | 10 ++--
 sections/artist/delete.php           |  8 +--
 sections/chat/index.php              | 90 +++++++++-------------------
 sections/collages/collage.php        |  4 +-
 sections/collages/edit.php           |  6 +-
 sections/donate/donate.php           | 62 +++++++++----------
 sections/donate/donate_gpal.php      | 62 +++++++++----------
 sections/login/disabled.php          | 73 +++++++++++-----------
 sections/login/index.php             |  1 +
 sections/reportsv2/array.php         |  2 +-
 sections/reportsv2/search.php        |  6 +-
 sections/reportsv2/takereport.php    |  2 +-
 sections/rules/ratio.php             | 80 ++++++++++---------------
 sections/rules/requests.php          | 10 ++--
 sections/rules/rules.php             | 64 +++++---------------
 sections/rules/upload.php            |  8 +--
 sections/tools/data/donation_log.php | 10 ++--
 sections/tools/managers/bans.php     | 16 ++---
 sections/tools/managers/eb.php       | 24 ++++----
 sections/user/user.php               | 30 +++++-----
 static/functions/iphone.js           |  2 +-
 static/styles/anorex/style.css       |  2 +-
 templates/invite.tpl                 |  2 +-
 27 files changed, 298 insertions(+), 382 deletions(-)

diff --git a/classes/class_templates.php b/classes/class_templates.php
index 30ee5c4f..05e8acf5 100644
--- a/classes/class_templates.php
+++ b/classes/class_templates.php
@@ -13,7 +13,7 @@ function open($file) {
 		$this->file=file($file);
 	}
 
-	function set($name,$var,$ifnone="<i>-None-</i>") {
+	function set($name,$var,$ifnone='<span style="font-style: italic;">-None-</span>') {
 		if ($name!='') {
 			$this->vars[$name][0]=$var;
 			$this->vars[$name][1]=$ifnone;
diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php
index ca4e8c88..3e31c46b 100644
--- a/classes/class_torrent_form.php
+++ b/classes/class_torrent_form.php
@@ -390,7 +390,7 @@ function show() {
 				<td class="label">Scene</td>
 				<td>
 					<input type="checkbox" id="scene" name="scene" <? if($Torrent['Scene']) { echo "checked='checked' ";}?>/>
-					Check this only if this is a 'scene release'. If you ripped it yourself, it is <strong>not</strong> a scene release. <br />If you are not sure, <strong>DO NOT</strong> check it, you will be penalized. For information on the scene, visit <a href="http://en.wikipedia.org/wiki/Scene_%28software%29">Wikipedia</a>.
+					Check this only if this is a 'scene release'. If you ripped it yourself, it is <strong>not</strong> a scene release. <br />If you are not sure, <strong>DO NOT</strong> check it; you will be penalized. For information on the scene, visit <a href="http://en.wikipedia.org/wiki/Scene_%28software%29">Wikipedia</a>.
 				</td>
 			</tr>
 			<tr>
@@ -408,7 +408,7 @@ function show() {
 		} 
 ?>
 					</select>
-				<b id="format_warning" style="color:red"></b>
+				<span id="format_warning" class="important_text"></span>
 				</td>
 			</tr>
 			<tr>
@@ -453,7 +453,7 @@ function show() {
 				<td class="label">Vanity House</td>
 				<td>
 					<label><input type="checkbox" id="vanity_house" name="vanity_house" <? if(!$Torrent['GroupID']) { echo 'disabled '; }?><? if($Torrent['VanityHouse']){ echo "checked='checked' ";}?>/>
-					Check this only if you are the submitting artist or submitting on behalf of the artist and this is intended to be a Vanity House release.  Checking this will also automatically add the group as a recommendation.</label>
+					Check this only if you are submitting your own work or submitting on behalf of the artist, and this is intended to be a Vanity House release.  Checking this will also automatically add the group as a recommendation.</label>
 				</td>
 			</tr>
 <?		} ?>
@@ -471,7 +471,7 @@ function show() {
 		} 
 ?>
 					</select>
-					<span id="cassette_true" class="hidden"><strong style="color:red;">Do NOT upload a cassette rip without first getting approval from a moderator!</strong></span>
+					<span id="cassette_true" class="hidden"><span class="important_text">Do NOT upload a cassette rip without first getting approval from a moderator!</span></span>
 				</td>
 			</tr>
 <?
@@ -491,8 +491,8 @@ function show() {
 			<tr>
 				<td class="label">Log/Cue</td>
 				<td>
-					<input type="checkbox" id="flac_log" name="flac_log"<? if($HasLog) { echo " checked='checked'";}?>/> Check this box if the torrent has (or should have) a log file.<br />
-					<input type="checkbox" id="flac_cue" name="flac_cue"<? if($HasCue) { echo " checked='checked'";}?>/> Check this box if the torrent has (or should have) a cue file.<br />
+					<input type="checkbox" id="flac_log" name="flac_log"<? if($HasLog) { echo " checked='checked'";}?> /> Check this box if the torrent has (or should have) a log file.<br />
+					<input type="checkbox" id="flac_cue" name="flac_cue"<? if($HasCue) { echo " checked='checked'";}?> /> Check this box if the torrent has (or should have) a cue file.<br />
 <?
 		}
 		global $LoggedUser;
@@ -510,7 +510,7 @@ function show() {
 				}
 ?>
 							<input type="checkbox" id="make_trumpable" name="make_trumpable"<? if ($Torrent['LogScore'] == 99) { echo " checked='checked'";}?>/> Check this box if you want this torrent to be trumpable (subtracts 1 point).
-<?			
+<?
 				if (!check_perms('users_mod')) {
 ?>						</td>
 					</tr>
@@ -532,7 +532,7 @@ function show() {
 				<td class="label">Log Adjustment Reason</td>
 				<td>
 					<textarea name="adjustment_reason" id="adjustment_reason" cols="60" rows="8"><?=display_str($Torrent['AdjustmentReason']); ?></textarea>
-					<p class="min_padding">Contains reason for adjusting a score. <b>This field is displayed on the torrent page</b>.</p> 
+					<p class="min_padding">Contains reason for adjusting a score. <strong>This field is displayed on the torrent page</strong>.</p> 
 				</td>
 			</tr>
 <?			}*/?>
@@ -620,7 +620,7 @@ function show() {
 				<td class="label">Release Description (optional)</td>
 				<td>
 					<textarea name="release_desc" id="release_desc" cols="60" rows="8"><?=display_str($Torrent['TorrentDescription']); ?></textarea>
-					<p class="min_padding">Contains information like encoder settings or details of the ripping process. <b>DO NOT PASTE THE RIPPING LOG HERE.</b></p>
+					<p class="min_padding">Contains information like encoder settings or details of the ripping process. <strong>DO NOT PASTE THE RIPPING LOG HERE.</strong></p>
 				</td>
 			</tr>
 		</table>
@@ -661,7 +661,7 @@ function audiobook_form() {
 			echo ">";
 			echo $Format;
 			echo "</option>\n";
-		} 
+		}
 ?>
 					</select>
 				</td>
@@ -715,15 +715,15 @@ function audiobook_form() {
 				<td class="label">Description</td>
 				<td>
 					<textarea name="album_desc" id="album_desc" cols="60" rows="8"><?=display_str($Torrent['GroupDescription']); ?></textarea>
-					<p class="min_padding">Contains information like the track listing, and maybe a review.</p>
+					<p class="min_padding">Contains information like the track listing, a review, a link to Discogs or MusicBrainz, etc.</p>
 				</td>
 			</tr>
-<?		}?> 
+<?		}?>
 			<tr>
 				<td class="label">Release Description (optional)</td>
 				<td>
 					<textarea name="release_desc" id="release_desc" cols="60" rows="8"><?=display_str($Torrent['TorrentDescription']); ?></textarea>
-					<p class="min_padding">Contains information like encoder settings, and/or a log of the ripping process.</p>
+					<p class="min_padding">Contains information like encoder settings. For analog rips, this frequently contains lineage information.</p>
 				</td>
 			</tr>
 		</table>
@@ -732,7 +732,7 @@ function audiobook_form() {
 
 
 
-	
+
 
 	function simple_form($CategoryID) {
 		$Torrent = $this->Torrent; 
diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index 65e36f8f..3c787d2f 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -656,27 +656,27 @@ function compare($X, $Y){
 			<ul class="stats nobullet">
 <?
 	if($NumSimilar == 0) { ?>
-				<li><i>None found</i></li> 
+				<li><span style="font-style: italic;">None found</span></li> 
 <?	}
 	$First = true;
 	foreach ($SimilarArray as $SimilarArtist) {	
 		list($Artist2ID, $Artist2Name, $Score, $SimilarID) = $SimilarArtist;
 		$Score = $Score/100;
 		if($First) {
-			$Max = $Score + 1	;
+			$Max = $Score + 1;
 			$First = false;
 		}
-		
+
 		$FontSize = (ceil((((($Score - 2)/$Max - 2) * 4)))) + 8;
-		
+
 ?>
 				<li>
 					<span title=<?=$Score?>><a href="artist.php?id=<?=$Artist2ID?>" style="float:left; display:block;"><?=$Artist2Name?></a></span>										<div style="float:right; display:block; letter-spacing: -1px;">
 					<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;">[-]</a>
 					<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;">[+]</a>
-<?		if(check_perms('site_delete_tag')) { ?> 
+<?		if(check_perms('site_delete_tag')) { ?>
 					<a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[X]</a>
-<?		} ?> 
+<?		} ?>
 					</div>
 					<br style="clear:both" />
 				</li>
@@ -704,7 +704,7 @@ function compare($X, $Y){
 echo $TorrentDisplayList;
 
 if($NumRequests > 0) {
-	
+
 ?>
 	<table cellpadding="6" cellspacing="1" border="0" class="request_table border" width="100%" id="requests">
 		<tr class="colhead_dark">
@@ -725,9 +725,9 @@ function compare($X, $Y){
 <?
 	foreach($Requests as $Request) {
 		list($RequestID, $CategoryID, $Title, $Year, $TimeAdded, $Votes, $Bounty) = $Request;
-		
+
 			$CategoryName = $Categories[$CategoryID - 1];
-			
+
 			if($CategoryName == "Music") {
 				$ArtistForm = get_request_artists($RequestID);
 				$ArtistLink = display_artists($ArtistForm, true, true);
@@ -737,16 +737,16 @@ function compare($X, $Y){
 			} else {
 				$FullName ="<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title."</a>";
 			}
-			
+
 			$Row = ($Row == 'a') ? 'b' : 'a';
-			
+
 			$Tags = get_request_tags($RequestID);
 ?>
 		<tr class="row<?=$Row?>">
 			<td>
 				<?=$FullName?>
 				<div class="tags">
-<?			
+<?
 		$TagList = array();
 		foreach($Tags as $TagID => $TagName) {
 			$TagList[] = "<a href='requests.php?tags=".$TagName."'>".display_str($TagName)."</a>";
@@ -761,7 +761,7 @@ function compare($X, $Y){
 <?  	if(check_perms('site_vote')){ ?>
 				<input type="hidden" id="auth" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 				&nbsp;&nbsp; <a href="javascript:Vote(0, <?=$RequestID?>)"><strong>(+)</strong></a>
-<?		} ?> 
+<?		} ?>
 			</td>
 			<td>
 				<span id="bounty_<?=$RequestID?>"><?=get_size($Bounty)?></span>
@@ -790,14 +790,14 @@ function compare($X, $Y){
 		$Img = new IMAGE;
 		$Img->create(WIDTH, HEIGHT);
 		$Img->color(255,255,255, 127);
-		
+
 		$Similar = new ARTISTS_SIMILAR($ArtistID, $Name);
 		$Similar->set_up();
 		$Similar->set_positions();
 		$Similar->background_image();
-		
+
 		$SimilarData = $Similar->dump_data();
-		
+
 		$Cache->cache_value('similar_positions_'.$ArtistID, $SimilarData, 3600*24);
 	}
 ?>
diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php
index 34669633..ae7613fe 100644
--- a/sections/artist/artist_rearrange.php
+++ b/sections/artist/artist_rearrange.php
@@ -514,27 +514,27 @@ function display_name($ReleaseType) {
 			<ul class="stats nobullet">
 <?
 	if($NumSimilar == 0) { ?>
-				<li><i>None found</i></li> 
+				<li><span style="font-style: italic;">None found</span></li>
 <?	}
 	$First = true;
-	foreach ($SimilarArray as $SimilarArtist) {	
+	foreach ($SimilarArray as $SimilarArtist) {
 		list($Artist2ID, $Artist2Name, $Score, $SimilarID) = $SimilarArtist;
 		$Score = $Score/100;
 		if($First) {
-			$Max = $Score + 1	;
+			$Max = $Score + 1;
 			$First = false;
 		}
-		
+
 		$FontSize = (ceil((((($Score - 2)/$Max - 2) * 4)))) + 8;
-		
+
 ?>
 				<li>
 					<span title=<?=$Score?>><a href="artist.php?id=<?=$Artist2ID?>" style="float:left; display:block;"><?=$Artist2Name?></a></span>										<div style="float:right; display:block; letter-spacing: -1px;">
 					<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;">[&minus;]</a>
 					<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;">[+]</a>
-<?		if(check_perms('site_delete_tag')) { ?> 
+<?		if(check_perms('site_delete_tag')) { ?>
 					<a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[X]</a>
-<?		} ?> 
+<?		} ?>
 					</div>
 					<br style="clear:both" />
 				</li>
@@ -562,7 +562,7 @@ function display_name($ReleaseType) {
 echo $TorrentDisplayList;
 
 if($NumRequests > 0) {
-	
+
 ?>
 	<table cellpadding="6" cellspacing="1" border="0" class="requests_table border" width="100%" id="requests">
 		<tr class="colhead_dark">
@@ -583,9 +583,9 @@ function display_name($ReleaseType) {
 <?
 	foreach($Requests as $Request) {
 		list($RequestID, $CategoryID, $Title, $Year, $TimeAdded, $Votes, $Bounty) = $Request;
-		
+
 			$CategoryName = $Categories[$CategoryID - 1];
-			
+
 			if($CategoryName == "Music") {
 				$ArtistForm = get_request_artists($RequestID);
 				$ArtistLink = display_artists($ArtistForm, true, true);
@@ -595,16 +595,16 @@ function display_name($ReleaseType) {
 			} else {
 				$FullName ="<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title."</a>";
 			}
-			
+
 			$Row = ($Row == 'a') ? 'b' : 'a';
-			
+
 			$Tags = get_request_tags($RequestID);
 ?>
 		<tr class="row<?=$Row?>">
 			<td>
 				<?=$FullName?>
 				<div class="tags">
-<?			
+<?
 		$TagList = array();
 		foreach($Tags as $TagID => $TagName) {
 			$TagList[] = "<a href='requests.php?tags=".$TagName."'>".display_str($TagName)."</a>";
@@ -615,7 +615,7 @@ function display_name($ReleaseType) {
 				</div>
 			</td>
 			<td>
-				<?=$Votes?> 
+				<?=$Votes?>
 <?  	if(check_perms('site_vote')){ ?>
 				<input type="hidden" id="auth" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 				&nbsp;&nbsp; <a href="javascript:Vote(0)"><strong>(+)</strong></a>
@@ -637,21 +637,21 @@ function display_name($ReleaseType) {
 
 if($NumSimilar>0) {
 	$SimilarData = $Cache->get_value('similar_positions_'.$ArtistID);
-	
+
 	if(!$Data) {
 		include(SERVER_ROOT.'/classes/class_image.php');
 		$Img = new IMAGE;
 		$Img->create(WIDTH, HEIGHT);
 		$Img->color(255,255,255, 127);
-		
+
 		$Similar = new ARTISTS_SIMILAR($ArtistID, $Name);
 		$Similar->set_up();
 		$Similar->set_positions();
 		$Similar->background_image();
-		
-		
+
+
 		$SimilarData = $Similar->dump_data();
-		
+
 		$Cache->cache_value('similar_positions_'.$ArtistID, $SimilarData, 3600*24);
 	} else {
 		$Similar = new ARTISTS_SIMILAR($ArtistID);
@@ -667,7 +667,7 @@ function display_name($ReleaseType) {
 ?>
 			</div>
 		</div>
-<? } // if $NumSimilar>0 ?> 
+<? } // if $NumSimilar>0 ?>
 		<div class="box">
 			<div class="head"><strong>Artist info</strong></div>
 			<div class="body"><?=$Text->full_format($Body)?></div>
@@ -680,9 +680,9 @@ function display_name($ReleaseType) {
 
 // Cache page for later use
 
-if($RevisionID) { 
+if($RevisionID) {
 	$Key = "artist_$ArtistID"."_revision_$RevisionID";
-} else { 
+} else {
 	$Key = 'artist_'.$ArtistID;
 }
 
diff --git a/sections/artist/change_artistid.php b/sections/artist/change_artistid.php
index 8b6ba6dc..c07bf826 100644
--- a/sections/artist/change_artistid.php
+++ b/sections/artist/change_artistid.php
@@ -3,7 +3,7 @@
 
 if (!check_perms('torrents_edit')) { error(403); }
 if (!empty($_POST['newartistid']) && !empty($_POST['newartistname'])) {
-	error("Please enter either an artist id OR an artist name.");
+	error("Please enter a valid artist ID number or a valid artist name.");
 }
 $ArtistID = (int)$_POST['artistid'];
 $NewArtistID = (int)$_POST['newartistid'];
@@ -23,7 +23,7 @@
 }
 
 if ($NewArtistID > 0) {
-	// Make sure that's a real artist id number, and grab the name
+	// Make sure that's a real artist ID number, and grab the name
 	$DB->query("SELECT Name FROM artists_group WHERE ArtistID = $NewArtistID LIMIT 1");	
 	if(!(list($NewArtistName) = $DB->next_record())) {
 		error('Please enter a valid artist ID number.');
@@ -37,7 +37,7 @@
 }
 
 if ($ArtistID == $NewArtistID) {
-	error("You cannot merge an artist with himself.");
+	error("You cannot merge an artist with itself.");
 }
 if (isset($_POST['confirm'])) {
 	// Get the information for the cache update
@@ -133,11 +133,11 @@
 		<input type="hidden" name="confirm" value="1" />
 		<div style="text-align: center;">
 			<p>Please confirm that you wish to make <a href="artist.php?id=<?=$ArtistID?>"><?=display_str($ArtistName)?> (<?=$ArtistID?>)</a> into a non-redirecting alias of <a href="artist.php?id=<?=$NewArtistID?>"><?=display_str($NewArtistName)?> (<?=$NewArtistID?>)</a>.</p>
-			<br>
+			<br />
 			<input type="submit" value="Confirm" />
 		</div>
 	</form>
 <?
 	show_footer();
 }
-?>
\ No newline at end of file
+?>
diff --git a/sections/artist/delete.php b/sections/artist/delete.php
index 13498517..566dabc5 100644
--- a/sections/artist/delete.php
+++ b/sections/artist/delete.php
@@ -28,8 +28,8 @@
 if($DB->record_count() > 0) {
 ?>
 	<div class="thin">
-		There are still torrents that have <a href="artist.php?id=<?=$ArtistID?>" title="View Artist"><?=$Name?></a> as an artist<br>
-		Please remove the artist from these torrents manually before attempting to delete.<br>
+		There are still torrents that have <a href="artist.php?id=<?=$ArtistID?>" title="View Artist"><?=$Name?></a> as an artist.<br />
+		Please remove the artist from these torrents manually before attempting to delete.<br />
 		<div class="box pad">
 			<ul>
 <?
@@ -56,8 +56,8 @@
 if($DB->record_count() > 0) {
 ?>
 	<div class="thin">
-		There are still requests that have <a href="artist.php?id=<?=$ArtistID?>" title="View Artist"><?=$Name?></a> as an artist<br>
-		Please remove the artist from these requests manually before attempting to delete.<br>
+		There are still requests that have <a href="artist.php?id=<?=$ArtistID?>" title="View Artist"><?=$Name?></a> as an artist.<br />
+		Please remove the artist from these requests manually before attempting to delete.<br />
 		<div class="box pad">
 			<ul>
 <?
diff --git a/sections/chat/index.php b/sections/chat/index.php
index ce1d3978..47588fb2 100644
--- a/sections/chat/index.php
+++ b/sections/chat/index.php
@@ -27,51 +27,21 @@
 	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
-			<li>
-				Staff have the final decision, if they say stop and you continue, expect at least to be banned from the IRC network.
-			</li>
-			<li>
-				Be respectful to IRC Operators and Administrators. These people are site staff who volunteer their time for little compensation. They are there for the benefit of all and to aid in conflict resolution; do not waste their time.
-			</li>
-			<li>
-				Do not link shock sites or anything NSFW (not safe for work) without a warning. If in doubt, ask a staff member in <?=BOT_HELP_CHAN?> about it.
-			</li>
-			<li>
-				Excessive swearing will get you kicked; keep swearing to a minimum.
-			</li>
-			<li>
-				Do not leave your Caps Lock on all the time. It gets annoying, and you will likely get yourself kicked.
-			</li>
-			<li>
-				No arguing. You can't win an argument over the Internet, so you're just wasting your time trying.
-			</li>
-			<li>
-				No prejudice, especially related to race, religion, politics, ethnic background, etc. It is highly suggested to avoid this entirely.
-			</li>
-			<li>
-				Flooding is irritating and will warrant you a kick. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand.
-			</li>
-			<li>
-				Impersonation of other members (particularly staff members) will not go unpunished. If you are uncertain of a user's identity, check their vhost.
-			</li>
-			<li>
-				Spamming is strictly forbidden. This includes, but is not limited to, personal sites, online auctions, and torrent uploads.
-			</li>
-			<li>
-				Obsessive annoyance both to other users and staff will not be tolerated.
-			</li>
-			<li>
-				Do not PM, DCC, or Query anyone you don't know or have never talked to without asking; this applies specifically to staff.
-			</li>
-			<li>
-				No language other than English is permitted in the official IRC channels. If we cannot understand it, we cannot moderate it.
-			</li>
-			<li>
-				The offering, selling, trading and giving away of invites to this or any other site on our IRC network is <strong>strictly forbidden</strong>.
-			</li>
-			<li>
-				<strong>Read the topic before asking questions.</strong>
-			</li>
+			<li>Staff have the final decision, if they say stop and you continue, expect at least to be banned from the IRC network.</li>
+			<li>Be respectful to IRC Operators and Administrators. These people are site staff who volunteer their time for little compensation. They are there for the benefit of all and to aid in conflict resolution; do not waste their time.</li>
+			<li>Do not link shock sites or anything NSFW (not safe for work) without a warning. If in doubt, ask a staff member in <?=BOT_HELP_CHAN?> about it.</li>
+			<li>Excessive swearing will get you kicked; keep swearing to a minimum.</li>
+			<li>Do not leave your Caps Lock on all the time. It gets annoying, and you will likely get yourself kicked.</li>
+			<li>No arguing. You can't win an argument over the Internet, so you're just wasting your time trying.</li>
+			<li>No prejudice, especially related to race, religion, politics, ethnic background, etc. It is highly suggested to avoid this entirely.</li>
+			<li>Flooding is irritating and will warrant you a kick. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand.</li>
+			<li>Impersonation of other members (particularly staff members) will not go unpunished. If you are uncertain of a user's identity, check their vhost.</li>
+			<li>Spamming is strictly forbidden. This includes, but is not limited to, personal sites, online auctions, and torrent uploads.</li>
+			<li>Obsessive annoyance, both to other users and staff, will not be tolerated.</li>
+			<li>Do not PM, DCC, or Query anyone you don't know or have never talked to without asking; this applies specifically to staff.</li>
+			<li>No language other than English is permitted in the official IRC channels. If we cannot understand it, we cannot moderate it.</li>
+			<li>The offering, selling, trading, and giving away of invites to this or any other site on our IRC network is <strong>strictly forbidden</strong>.</li>
+			<li><strong>Read the topic before asking questions.</strong></li>
 		</ul>
 		<form class="confirm_form center" name="chat" method="post" action="chat.php">
 			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
@@ -97,24 +67,22 @@
 	</div>
 	<div class="box pad" style="padding:10px 0px 10px 0px;">
 		<div style="padding:0px 10px 10px 20px;">
-			<p>If you have an IRC client, visit <a href="wiki.php?action=article&amp;name=IRC+-+How+to+join">this wiki entry</a> for information on how to connect. (IRC applet users are automatically identified with Drone.)</p>
+			<p>If you have an IRC client, refer to <a href="wiki.php?action=article&amp;name=IRC+-+How+to+join">this wiki article</a> for information on how to connect. (IRC applet users are automatically identified with Drone.)</p>
 		</div>
-		<center>
-			<applet codebase="static/irc/" code="IRCApplet.class" archive="irc.jar,sbox.jar" width="800" height="600">
-				<param name="nick" value="<?=$nick?>" />
-				<param name="alternatenick" value="WhatGuest????" />
-				<param name="name" value="Java IRC User" />
-				<param name="host" value="<?=BOT_SERVER?>" />
-				<param name="multiserver" value="true" />
-				<param name="autorejoin" value="false" />
+		<applet codebase="static/irc/" code="IRCApplet.class" archive="irc.jar,sbox.jar" width="800" height="600" align="center">
+			<param name="nick" value="<?=$nick?>" />
+			<param name="alternatenick" value="WhatGuest????" />
+			<param name="name" value="Java IRC User" />
+			<param name="host" value="<?=BOT_SERVER?>" />
+			<param name="multiserver" value="true" />
+			<param name="autorejoin" value="false" />
 
-				<param name="gui" value="sbox" />
-				<param name="pixx:highlight" value="true" />
-				<param name="pixx:highlightnick" value="true" />
-				<param name="pixx:prefixops" value="true" />
-				<param name="sbox:scrollspeed" value="5" />
-			</applet>
-		</center>
+			<param name="gui" value="sbox" />
+			<param name="pixx:highlight" value="true" />
+			<param name="pixx:highlightnick" value="true" />
+			<param name="pixx:prefixops" value="true" />
+			<param name="sbox:scrollspeed" value="5" />
+		</applet>
 	</div>
 </div>
 <?
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index b88ecb21..f7669151 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -540,7 +540,7 @@ function compare($X, $Y){
 					<input type="text" size="20" name="url" />
 					<input type="submit" value="+" />
 					<br />
-					<i>Enter the URL of a torrent on the site.</i>
+					<span style="font-style: italic;">Enter the URL of a torrent on the site.</span>
 				</form>
 			</div>
 			<div class="pad hidden add_torrent_container">
@@ -551,7 +551,7 @@ function compare($X, $Y){
 					<textarea name="urls" rows="5" cols="25" wrap="off"></textarea><br />
 					<input type="submit" value="Add" />
 					<br />
-					<i>Enter the URLs of torrents on the site, one to a line.</i>
+					<span style="font-style: italic;">Enter the URLs of torrents on the site, one per line.</span>
 				</form>
 			</div>
 		</div>
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index 947529a8..3f6a1af4 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -49,15 +49,15 @@
 				<td class="label">Tags</td>
 				<td><input type="text" name="tags" size="60" value="<?=$TagList?>" /></td>
 			</tr>
-<? if($CategoryID == 0) { ?>
+<? if($CategoryID == 0) { ?> // CategoryID==0 is "Personal" collages
 			<tr>
-				<td class="label">Featured</td>
+				<td class="label"><span title="A &quot;featured&quot; personal collage will be listed first on your profile.">Featured</span></td>
 				<td><input type="checkbox" name="featured" <?=($Featured?'checked':'')?> /></td>
 			</tr>
 <? }
    if(check_perms('site_collages_delete')) { ?>
 			<tr>
-				<td class="label">Locked</td>
+				<td class="label"><span title="This feature has not been implemented yet. It currently does nothing.">Locked</span></td>
 				<td><input type="checkbox" name="locked" <?if($Locked) { ?>checked="checked" <? }?>/></td>
 			</tr>
 			<tr>
diff --git a/sections/donate/donate.php b/sections/donate/donate.php
index 43e23f67..60acd978 100644
--- a/sections/donate/donate.php
+++ b/sections/donate/donate.php
@@ -4,7 +4,7 @@
 
 //Include the header
 if($LoggedUser['RatioWatch']) {
-	error('Due to the high volume of paypal disputes, we do not accept donations from users on ratio watch. Sorry.');
+	error('Due to the high volume of PayPal disputes, we do not accept donations from users on ratio watch. Sorry.');
 }
 
 if(!$UserCount = $Cache->get_value('stats_user_count')){
@@ -28,18 +28,18 @@
 	</div>
 	<div class="box pad">
 		<form class="donate_form" name="test_paypal" method="post" action="donate.php">
-			<input type="hidden" name="action" value="ipn">
+			<input type="hidden" name="action" value="ipn" />
 			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-			<?=PAYPAL_SYMBOL?> <input type="text" name="mc_gross" value="<?=number_format(PAYPAL_MINIMUM,2)?>">
-			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>">
-			<input type="hidden" name="payment_status" value="Completed">
-			<input type="hidden" name="mc_fee" value="0.45">
-			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>">
-			<input type="hidden" name="txn_id" value="0">
-			<input type="hidden" name="payment_type" value="instant">
-			<input type="text" name="payer_email" value="<?=$LoggedUser['Username']?>@<?=NONSSL_SITE_URL?>">
-			<input type="hidden" name="mc_currency" value="<?=PAYPAL_CURRENCY?>">
-			<input name="test" type="submit" value="Donate">
+			<?=PAYPAL_SYMBOL?> <input type="text" name="mc_gross" value="<?=number_format(PAYPAL_MINIMUM,2)?>" />
+			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>" />
+			<input type="hidden" name="payment_status" value="Completed" />
+			<input type="hidden" name="mc_fee" value="0.45" />
+			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>" />
+			<input type="hidden" name="txn_id" value="0" />
+			<input type="hidden" name="payment_type" value="instant" />
+			<input type="text" name="payer_email" value="<?=$LoggedUser['Username']?>@<?=NONSSL_SITE_URL?>" />
+			<input type="hidden" name="mc_currency" value="<?=PAYPAL_CURRENCY?>" />
+			<input name="test" type="submit" value="Donate" />
 		</form>
 	</div>
 <?
@@ -49,25 +49,25 @@
 		<h3>Donate</h3>
 	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
-		<p>We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (Servers, Components, etc.), in addition to operating expenses (Bandwidth, Power, etc.).</p>
+		<p>We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (servers, components, etc.), in addition to operating expenses (bandwidth, power, etc.).</p>
 		<p>Because we do not have any advertisements or sponsorships and this service is provided free of charge, we are entirely reliant upon user donations. If you are financially able, please consider making a donation to help us pay the bills!</p>
-		<p>We currently only accept one payment method; PayPal. Because of the fees they charge, there is a <strong>minimum donation amount of <?=PAYPAL_SYMBOL?> <?=PAYPAL_MINIMUM?></strong> (Please note, this is only a minimum amount and we greatly appreciate any extra you can afford.).</b></p>
-		<p>You don't have to be a PayPal member to make a donation, you can simply donate with your credit/debit card. If you do not have a credit/debit card, you should be able to donate from your bank account, but you will need to make an account with them to do this.</p>
+		<p>We currently only accept one payment method: PayPal. Because of the fees they charge, there is a <strong>minimum donation amount of <?=PAYPAL_SYMBOL?> <?=PAYPAL_MINIMUM?></strong> (Please note, this is only a minimum amount and we greatly appreciate any extra you can afford.).</p>
+		<p>You don't have to be a PayPal member to make a donation, you can simply donate with your credit or debit card. If you do not have a credit or debit card, you should be able to donate from your bank account, but you will need to make an account with them to do this.</p>
 		<form class="donate_form" name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-			<input type="hidden" name="rm" value="2">
-			<input type="hidden" name="cmd" value="_donations">
-			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>">
-			<input type="hidden" name="return" value="http://<?=SITE_URL?>/donate.php?action=complete">
-			<input type="hidden" name="cancel_return" value="http://<?=SITE_URL?>/donate.php?action=cancel">
-			<input type="hidden" name="notify_url" value="http://<?=NONSSL_SITE_URL?>/donate.php?action=ipn">
-			<input type="hidden" name="item_name" value="Donation">
-			<input type="hidden" name="amount" value="">
-			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>">
-			<input type="hidden" name="no_shipping" value="0">
-			<input type="hidden" name="no_note" value="1">
-			<input type="hidden" name="currency_code" value="<?=PAYPAL_CURRENCY?>">
-			<input type="hidden" name="tax" value="0">
-			<input type="hidden" name="bn" value="PP-DonationsBF">
+			<input type="hidden" name="rm" value="2" />
+			<input type="hidden" name="cmd" value="_donations" />
+			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>" />
+			<input type="hidden" name="return" value="http://<?=SITE_URL?>/donate.php?action=complete" />
+			<input type="hidden" name="cancel_return" value="http://<?=SITE_URL?>/donate.php?action=cancel" />
+			<input type="hidden" name="notify_url" value="http://<?=NONSSL_SITE_URL?>/donate.php?action=ipn" />
+			<input type="hidden" name="item_name" value="Donation" />
+			<input type="hidden" name="amount" value="" />
+			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>" />
+			<input type="hidden" name="no_shipping" value="0" />
+			<input type="hidden" name="no_note" value="1" />
+			<input type="hidden" name="currency_code" value="<?=PAYPAL_CURRENCY?>" />
+			<input type="hidden" name="tax" value="0" />
+			<input type="hidden" name="bn" value="PP-DonationsBF" />
 			<input type="submit" value="PayPal Donate" />
 		</form>
 	</div>
@@ -78,7 +78,7 @@
 		<ul>
 <? if($LoggedUser['Donor']) { ?>
 			<li>Even more love! (You will not get multiple hearts.)</li>
-			<li>A warmer fuzzier feeling than before!</li>
+			<li>A warmer, fuzzier feeling than before!</li>
 <? } else { ?>
 			<li>Our eternal love, as represented by the <img src="<?=STATIC_SERVER?>common/symbols/donor.png" alt="Donor" /> you get next to your name.</li>
 <?
@@ -96,7 +96,7 @@
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 <? if($LoggedUser['Donor']) { ?>
-			<li>2 more invitations, these were one time only.</li>
+			<li>2 more invitations; these are one time only.</li>
 <? } ?>
 			<li>Immunity from the rules.</li>
 			<li>Additional upload credit.</li>
diff --git a/sections/donate/donate_gpal.php b/sections/donate/donate_gpal.php
index c39a655c..a9bf4f7e 100644
--- a/sections/donate/donate_gpal.php
+++ b/sections/donate/donate_gpal.php
@@ -27,18 +27,18 @@
 	</div>
 	<div class="box pad">
 		<form class="donate_form" name="test_paypal" method="post" action="donate.php">
-			<input type="hidden" name="action" value="ipn">
+			<input type="hidden" name="action" value="ipn" />
 			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-			<?=PAYPAL_SYMBOL?> <input type="text" name="mc_gross" value="<?=number_format(PAYPAL_MINIMUM,2)?>">
-			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>">
-			<input type="hidden" name="payment_status" value="Completed">
-			<input type="hidden" name="mc_fee" value="0.45">
-			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>">
-			<input type="hidden" name="txn_id" value="0">
-			<input type="hidden" name="payment_type" value="instant">
-			<input type="text" name="payer_email" value="<?=$LoggedUser['Username']?>@<?=NONSSL_SITE_URL?>">
-			<input type="hidden" name="mc_currency" value="<?=PAYPAL_CURRENCY?>">
-			<input name="test" type="submit" value="Donate">
+			<?=PAYPAL_SYMBOL?> <input type="text" name="mc_gross" value="<?=number_format(PAYPAL_MINIMUM,2)?>" />
+			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>" />
+			<input type="hidden" name="payment_status" value="Completed" />
+			<input type="hidden" name="mc_fee" value="0.45" />
+			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>" />
+			<input type="hidden" name="txn_id" value="0" />
+			<input type="hidden" name="payment_type" value="instant" />
+			<input type="text" name="payer_email" value="<?=$LoggedUser['Username']?>@<?=NONSSL_SITE_URL?>" />
+			<input type="hidden" name="mc_currency" value="<?=PAYPAL_CURRENCY?>" />
+			<input name="test" type="submit" value="Donate" />
 		</form>
 	</div>
 <?
@@ -48,25 +48,25 @@
 		<h3>Donate</h3>
 	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
-		<p>We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (Servers, Components, etc.), in addition to operating expenses (Bandwidth, Power, etc.).</p>
+		<p>We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (servers, components, etc.), in addition to operating expenses (bandwidth, power, etc.).</p>
 		<p>Because we do not have any advertisements or sponsorships and this service is provided free of charge, we are entirely reliant upon user donations. If you are financially able, please consider making a donation to help us pay the bills!</p>
-		<p>We currently only accept one payment method; PayPal. Because of the fees they charge, there is a <strong>minimum donation amount of <?=PAYPAL_SYMBOL?> <?=PAYPAL_MINIMUM?></strong> (Please note, this is only a minimum amount and we greatly appreciate any extra you can afford.).</b></p>
-		<p>You don't have to be a PayPal member to make a donation, you can simply donate with your credit/debit card. If you do not have a credit/debit card, you should be able to donate from your bank account, but you will need to make an account with them to do this.</p>
+		<p>We currently only accept one payment method: PayPal. Because of the fees they charge, there is a <strong>minimum donation amount of <?=PAYPAL_SYMBOL?> <?=PAYPAL_MINIMUM?></strong> (Please note, this is only a minimum amount and we greatly appreciate any extra you can afford.).</p>
+		<p>You don't have to be a PayPal member to make a donation, you can simply donate with your credit or debit card. If you do not have a credit or debit card, you should be able to donate from your bank account, but you will need to make an account with them to do this.</p>
 		<form class="donate_form" name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-			<input type="hidden" name="rm" value="2">
-			<input type="hidden" name="cmd" value="_donations">
-			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>">
-			<input type="hidden" name="return" value="http://<?=SITE_URL?>/donate.php?action=complete">
-			<input type="hidden" name="cancel_return" value="http://<?=SITE_URL?>/donate.php?action=cancel">
-			<input type="hidden" name="notify_url" value="http://<?=NONSSL_SITE_URL?>/donate.php?action=ipn">
-			<input type="hidden" name="item_name" value="Donation">
-			<input type="hidden" name="amount" value="">
-			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>">
-			<input type="hidden" name="no_shipping" value="0">
-			<input type="hidden" name="no_note" value="1">
-			<input type="hidden" name="currency_code" value="<?=PAYPAL_CURRENCY?>">
-			<input type="hidden" name="tax" value="0">
-			<input type="hidden" name="bn" value="PP-DonationsBF">
+			<input type="hidden" name="rm" value="2" />
+			<input type="hidden" name="cmd" value="_donations" />
+			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>" />
+			<input type="hidden" name="return" value="http://<?=SITE_URL?>/donate.php?action=complete" />
+			<input type="hidden" name="cancel_return" value="http://<?=SITE_URL?>/donate.php?action=cancel" />
+			<input type="hidden" name="notify_url" value="http://<?=NONSSL_SITE_URL?>/donate.php?action=ipn" />
+			<input type="hidden" name="item_name" value="Donation" />
+			<input type="hidden" name="amount" value="" />
+			<input type="hidden" name="custom" value="<?=$LoggedUser['ID']?>" />
+			<input type="hidden" name="no_shipping" value="0" />
+			<input type="hidden" name="no_note" value="1" />
+			<input type="hidden" name="currency_code" value="<?=PAYPAL_CURRENCY?>" />
+			<input type="hidden" name="tax" value="0" />
+			<input type="hidden" name="bn" value="PP-DonationsBF" />
 			<input type="submit" value="PayPal Donate" />
 		</form>
 	</div>
@@ -77,7 +77,7 @@
 		<ul>
 <? if($LoggedUser['Donor']) { ?>
 			<li>Even more love! (You will not get multiple hearts.)</li>
-			<li>A warmer fuzzier feeling than before!</li>
+			<li>A warmer, fuzzier feeling than before!</li>
 <? } else { ?>
 			<li>Our eternal love, as represented by the <img src="<?=STATIC_SERVER?>common/symbols/donor.png" alt="Donor" /> you get next to your name.</li>
 			<li>2 invitations, to invite 2 good friends to use this tracker.</li>
@@ -88,7 +88,7 @@
 <? } ?>
 			<li>Immunity to inactivity pruning.</li>
 			<li>Access to an ever growing list of exclusive features, including the ability to submit requests and personal collages.</li>
-			<li>A warm fuzzy feeling.</li>
+			<li>A warm, fuzzy feeling.</li>
 
 <? } ?>
 		</ul>
@@ -97,7 +97,7 @@
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 <? if($LoggedUser['Donor']) { ?>
-			<li>2 more invitations, these were one time only.</li>
+			<li>2 more invitations; these are one time only.</li>
 <? } ?>
 			<li>Immunity from the rules.</li>
 			<li>Additional upload credit.</li>
diff --git a/sections/login/disabled.php b/sections/login/disabled.php
index ff0bec98..bfe43a08 100644
--- a/sections/login/disabled.php
+++ b/sections/login/disabled.php
@@ -4,13 +4,13 @@
 ?>
 <p class="warning">
 Your account has been disabled.<br />
-This is either due to inactivity or rule violation.<br />
-To discuss this come to our IRC at: <?=BOT_SERVER?><br />
+This is either due to inactivity or rule violation(s).<br />
+To discuss this with staff, come to our IRC network at: <?=BOT_SERVER?><br />
 And join <?=BOT_DISABLED_CHAN?><br /><br />
-Be honest - at this point, lying will get you nowhere.<br /><br/><br/>
+<strong>Be honest.</strong> At this point, lying will get you nowhere.<br /><br /><br />
 </p>
 
-<strong>Before joining the disabled channel please read our <br/> <span style="color:gold;">Golden Rules</span> which can be found <a style="color:#1464F4;" href="#" onclick="toggle_visibility('golden_rules')">here.</a></strong> <br/><br/>
+<strong>Before joining the disabled channel, please read our <br /> <span style="color:gold;">Golden Rules</span> which can be found <a style="color:#1464F4;" href="#" onclick="toggle_visibility('golden_rules')">here.</a></strong> <br /><br />
 
 <script type="text/javascript">
     function toggle_visibility(id) {
@@ -24,30 +24,27 @@ function toggle_visibility(id) {
 
 <div id="golden_rules" style="width:35%;font-weight:bold;display:none;" >
 <ul>
-<li>All staff decisions must be respected. If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site. Complaining about staff decisions in public or otherwise disrespecting staff members will not be taken lightly.</li><br/>
-<li>Access to this website is a privilege, not a right, and it can be taken away from you for any reason.</li><br/>
-<li>One account per person per lifetime. Anyone creating additional accounts will be banned.</li><br/>
-<li>Avatars must not exceed 256 kB or be vertically longer than 400 pixels. Avatars must be safe for work, be entirely unoffensive, and cannot contain any nudity or religious imagery. Use common sense.</li><br/>
-<li>Do not post our .torrent files on other sites. Every .torrent file has your personal passkey embedded in it. The tracker will automatically disable your account if you share your torrent files with others. You will not get your account back. This doesn't prohibit you from sharing the content on other sites, but does prohibit you from sharing the .torrent file.</li><br/>
-<li>Any torrent you are seeding to this tracker must only have our tracker's URL in it. Adding another tracker's URL will cause incorrect data to be sent to our tracker, and will lead to your getting disabled for cheating. Similarly, your client must have DHT and PEX disabled for all What.CD torrents.</li><br/>
-<li>This is a torrent site which promotes sharing amongst the community. If you are not willing to give back to the community what you take from it, this site is not for you. In other words, we expect you to have an acceptable share </li><br/>
-<li>Do not browse the site using proxies or TOR. The site will automatically alert us. This includes VPNs with dynamic IP addresses.</li><br/>
-<li>Asking for invites to any site is not allowed anywhere on What.CD or our IRC network. Invites may be offered in the Invites forum, and nowhere else.</li><br/>
-<li>Trading, selling, sharing, or giving away your account is prohibited. PM a mod to disable your account if you no longer want it.</li><br/>
-<li>You're completely responsible for the people you invite. If your invitees are caught cheating or trading/selling invites, not only will they be banned, so will you. Be careful who you invite. Invites are a precious commodity.</li><br/>
-<li>Be careful when sharing an IP or a computer with a friend if they have (or have had) an account. From then on your accounts will be inherently linked and if one of you violates the rules, both accounts will be disabled along with any other accounts linked by IP. This rule applies to logging into the site.</li><br/>
-<li>Attempting to find or exploit a bug in the site code is the worst possible offense you can commit. We have automatic systems in place for monitoring these activities, and committing them will result in the banning of you, your inviter, and your inviter's entire invite tree.</li><br/>
-<li>We're a community. Working together is what makes this place what it is. There are well over a thousand new torrents uploaded every day and sadly the staff aren't psychic. If you come across something that violates a rule, report it and help us better organize the site for you.</li><br/>
-<li>We respect the wishes of other sites here, as we wish for them to do the same. Please refrain from posting links to or full names for sites that do not want to be mentioned.</li><br/>
-
+	<li>All staff decisions must be respected. If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site. Complaining about staff decisions in public or otherwise disrespecting staff members will not be taken lightly.</li>
+	<li>Access to this web site is a privilege, not a right, and it can be taken away from you for any reason.</li>
+	<li>One account per person per lifetime. Anyone creating additional accounts will be banned.</li>
+	<li>Avatars must not exceed 256 kB or be vertically longer than 400 pixels. Avatars must be safe for work, be entirely unoffensive, and cannot contain any nudity or religious imagery. Use common sense.</li>
+A	<li>Do not post our .torrent files on other sites. Every .torrent file has your personal passkey embedded in it. The tracker will automatically disable your account if you share your torrent files with others. You will not get your account back. This doesn't prohibit you from sharing the content on other sites, but it does prohibit you from sharing the .torrent file.</li>
+	<li>Any torrent you are seeding to this tracker must only have our tracker's URL in it. Adding another tracker's URL will cause incorrect data to be sent to our tracker and will lead to you getting disabled for cheating. Similarly, your client must have DHT and PEX (peer exchange) disabled for all What.CD torrents.</li>
+	<li>This is a torrent site which promotes sharing amongst the community. If you are not willing to give back to the community what you take from it, this site is not for you. In other words, we expect you to have an acceptable share </li>
+	<li>Do not browse the site using proxies or TOR. The site will automatically alert us. This includes VPNs with dynamic IP addresses.</li>
+	<li>Asking for invites to any site is not allowed anywhere on What.CD or our IRC network. Invites may be offered in the Invites forum, and nowhere else.</li>
+	<li>Trading, selling, sharing, or giving away your account is prohibited. If you no longer want your account, send a staff PM requesting that it be disabled.</li>
+	<li>You're completely responsible for the people you invite. If your invitees are caught cheating or trading/selling invites, not only will they be banned, so will you. Be careful who you invite. Invites are a precious commodity.</li>
+	<li>Be careful when sharing an IP address or a computer with a friend if they have (or have had) an account. From then on your accounts will be inherently linked and if one of you violates the rules, both accounts will be disabled along with any other accounts linked by IP. This rule applies to logging into the site.</li>
+	<li>Attempting to find or exploit a bug in the site code is the worst possible offense you can commit. We have automatic systems in place for monitoring these activities, and committing them will result in the banning of you, your inviter, and your inviter's entire invite tree.</li>
+	<li>We're a community. Working together is what makes this place what it is. There are well over a thousand new torrents uploaded every day and sadly the staff aren't psychic. If you come across something that violates a rule, report it and help us better organize the site for you.</li>
+	<li>We respect the wishes of other sites here, as we wish for them to do the same. Please refrain from posting links to or full names for sites that do not want to be mentioned.</li>
 </ul>
-
 </div>
 
-</p>
 <p class="strong">
-If you do not have access to an IRC client you can use the WebIRC interface provided below.<br />
-Please use your What.CD? username.
+If you do not have access to an IRC client, you can use the WebIRC interface provided below.<br />
+Please use your What.CD username.
 </p>
 <br />
 <form class="confirm_form" name="chat" action="" method="post">
@@ -75,22 +72,20 @@ function toggle_visibility(id) {
 		<div style="padding:0px 10px 10px 20px;">
 			<p>Please read the topic carefully.</p>
 		</div>
-		<center>
-			<applet codebase="static/irc/" code="IRCApplet.class" archive="irc.jar,sbox.jar" width=800 height=600>
-				<param name="nick" value="<?=$nick?>">
-				<param name="alternatenick" value="WhatGuest????">
-				<param name="name" value="Java IRC User">
-				<param name="host" value="<?=BOT_SERVER?>">
-				<param name="multiserver" value="false">
-				<param name="autorejoin" value="false">
+		<applet codebase="static/irc/" code="IRCApplet.class" archive="irc.jar,sbox.jar" width="800" height="600" align="center">
+			<param name="nick" value="<?=$nick?>">
+			<param name="alternatenick" value="WhatGuest????">
+			<param name="name" value="Java IRC User">
+			<param name="host" value="<?=BOT_SERVER?>">
+			<param name="multiserver" value="false">
+			<param name="autorejoin" value="false">
 
-				<param name="gui" value="sbox">
-				<param name="pixx:highlight" value="true">
-				<param name="pixx:highlightnick" value="true">
-				<param name="pixx:prefixops" value="true">
-				<param name="sbox:scrollspeed" value="5">
-			</applet>
-		</center>
+			<param name="gui" value="sbox">
+			<param name="pixx:highlight" value="true">
+			<param name="pixx:highlightnick" value="true">
+			<param name="pixx:prefixops" value="true">
+			<param name="sbox:scrollspeed" value="5">
+		</applet>
 	</div>
 </div>
 <?
diff --git a/sections/login/index.php b/sections/login/index.php
index fe8cd39b..d535aa69 100644
--- a/sections/login/index.php
+++ b/sections/login/index.php
@@ -62,6 +62,7 @@
 						WHERE m.ID='".db_string($UserID)."' 
 						AND i.UserID=m.ID");
 					$Reset = true; // Past tense form of "to reset", meaning that password has now been reset
+					
                     
                 }
 			}
diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php
index c49bd9b0..e78f98ad 100644
--- a/sections/reportsv2/array.php
+++ b/sections/reportsv2/array.php
@@ -697,7 +697,7 @@
 					'upload' => '0',
 					'warn' => '1',
 					'delete' => '1',
-					'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.4]4.1.4[/url]. Release descriptions for applications must contain good information about the application. You should either have a small description of the program (either taken from its website or from an NFO file) or a link to the information -- but ideally both. Torrents missing this information will be deleted when reported.
+					'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.4]4.1.4[/url]. Release descriptions for applications must contain good information about the application. You should either have a small description of the program (either taken from its web site or from an NFO file) or a link to the information -- but ideally both. Torrents missing this information will be deleted when reported.
 Your torrent was reported because it lacked adequate release information.'
 				)
 			),
diff --git a/sections/reportsv2/search.php b/sections/reportsv2/search.php
index 1f9da42f..a4639364 100644
--- a/sections/reportsv2/search.php
+++ b/sections/reportsv2/search.php
@@ -1,6 +1,6 @@
 <?
 /*
- * I'm not writing documentation for this page untill I write this page >.>
+ * TODO: I'm not writing documentation for this page until I write this page >.>
  */
 if(!check_perms('admin_reports')){
 	error(403);
@@ -14,7 +14,7 @@
 <? include('header.php'); ?>
 </div>
 <br />
-On hold until FZeroX fixes the main torrents search, then I will steal all his work and claim it as my own.
+On hold until FZeroX fixes the main torrents search; then I will steal all his work and claim it as my own.
 <?
 show_footer();
-?>
\ No newline at end of file
+?>
diff --git a/sections/reportsv2/takereport.php b/sections/reportsv2/takereport.php
index 8dd4ebca..af3dc35c 100644
--- a/sections/reportsv2/takereport.php
+++ b/sections/reportsv2/takereport.php
@@ -86,7 +86,7 @@
 	if(preg_match('/([0-9]+( [0-9]+)*)|All/is', $_POST['track'], $Matches)) {
 		$Tracks = $Matches[0];
 	} else {
-		$Err = "Tracks should be given in a space seperated list of numbers (No other characters)";
+		$Err = "Tracks should be given in a space separated list of numbers (no other characters)";
 	}
 } else {
 	$Tracks = "";
diff --git a/sections/rules/ratio.php b/sections/rules/ratio.php
index 7462d43c..8e32bfc0 100644
--- a/sections/rules/ratio.php
+++ b/sections/rules/ratio.php
@@ -8,138 +8,122 @@
 	</div>
 	<div class="box pad">
 		<p>
-			Your ratio is the amount you've uploaded divided by the amount you've downloaded. 
+			Your ratio is the amount you have uploaded divided by the amount you have downloaded.
 		</p>
 		<p>
-			To maintain leeching privileges, we require that you maintain a ratio above a minimum ratio. This is called your "required ratio". If your upload/download ratio goes below your required ratio, your account will be given a two week period to fix it before you lose your ability to download. This is called "ratio watch". 
+			To maintain leeching privileges, we require that you maintain a ratio above a minimum ratio. This is called your "required ratio". If your upload/download ratio goes below your required ratio, your account will be given a two week period to fix it before you lose your ability to download. This is called "ratio watch".
 		</p>
-		
 		<p>
-			The required ratio is <strong>NOT the extra amount of ratio you need to gain</strong>. It is the <strong>minimum</strong> required ratio you must maintain. 
+			The required ratio is <strong>NOT the extra amount of ratio you need to gain</strong>. It is the <strong>minimum</strong> required ratio you must maintain.
 		</p>
-		
 		<p>
-			Your required ratio is unique, and is calculated from the amount you've downloaded, and the percentage of your snatched torrents which you are still seeding. 
+			Your required ratio is unique, and is calculated from the amount you have downloaded, and the percentage of your snatched torrents which you are still seeding.
 		</p>
-		
 		<p>
-			<b>It is not necessary to know how this ratio is calculated. What you need to know is that downloading makes the required ratio go up (bad) and seeding your snatches forever makes your required ratio go down (good). You can view your required ratio in the site header (it is the "Required" value). You want a high ratio, and a low required ratio.</b> 
+			<strong>It is not necessary to know how this ratio is calculated. What you need to know is that downloading makes the required ratio go up (bad) and seeding your snatches forever makes your required ratio go down (good). You can view your required ratio in the site header (it is the "Required" value). You want a high ratio, and a low required ratio.</strong>
 		</p>
-		
 		<p>
-			The exact formula for calculating the required ratio is provided merely for the curious. It is done in three steps. 
+			The exact formula for calculating the required ratio is provided merely for the curious. It is done in three steps.
 		</p>
-		
 		<p>
-			The first step is by determining how high and how low your required ratio can be. This is determined by looking up how much you've downloaded from the following table:
+			The first step is by determining how high and how low your required ratio can be. This is determined by looking up how much you have downloaded from the following table:
 		</p>
-		
+
 		<table>
 			<tr class="colhead">
-				<td>Amount downloaded</td>
+				<td><span title="These units are actually in base 2, not base 10. For example, there are 1,024 MB in 1 GB.">Amount downloaded</span></td>
 				<td>Required ratio (0% seeded)</td>
 				<td>Required ratio (100% seeded)</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] < 5*1024*1024*1024)?'a':'b'?>">
-				<td>0-5GB</td>
+				<td>0-5 GB</td>
 				<td>0.00</td>
 				<td>0.00</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 5*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 10*1024*1024*1024)?'a':'b'?>">
-				<td>5-10GB</td>
+				<td>5-10 GB</td>
 				<td>0.15</td>
 				<td>0.00</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 10*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 20*1024*1024*1024)?'a':'b'?>">
-				<td>10-20GB</td>
+				<td>10-20 GB</td>
 				<td>0.20</td>
 				<td>0.00</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 20*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 30*1024*1024*1024)?'a':'b'?>">
-				<td>20-30GB</td>
+				<td>20-30 GB</td>
 				<td>0.30</td>
 				<td>0.05</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 30*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 40*1024*1024*1024)?'a':'b'?>">
-				<td>30-40GB</td>
+				<td>30-40 GB</td>
 				<td>0.40</td>
 				<td>0.10</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 40*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 50*1024*1024*1024)?'a':'b'?>">
-				<td>40-50GB</td>
+				<td>40-50 GB</td>
 				<td>0.50</td>
 				<td>0.20</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 50*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 60*1024*1024*1024)?'a':'b'?>">
-				<td>50-60GB</td>
+				<td>50-60 GB</td>
 				<td>0.60</td>
 				<td>0.30</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 60*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 80*1024*1024*1024)?'a':'b'?>">
-				<td>60-80GB</td>
+				<td>60-80 GB</td>
 				<td>0.60</td>
 				<td>0.40</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 80*1024*1024*1024 && $LoggedUser['BytesDownloaded'] < 100*1024*1024*1024)?'a':'b'?>">
-				<td>80-100GB</td>
+				<td>80-100 GB</td>
 				<td>0.60</td>
 				<td>0.50</td>
 			</tr>
 			<tr class="row<?=($LoggedUser['BytesDownloaded'] >= 100*1024*1024*1024)?'a':'b'?>">
-				<td>100+GB</td>
+				<td>100+ GB</td>
 				<td>0.60</td>
 				<td>0.60</td>
 			</tr>
 		</table>
 		
 		<p>
-			So for example, if you've downloaded 25GB, your required ratio will be somewhere between 0.05 and 0.30. 
+			For example, if you have downloaded 25 GB, your required ratio will be somewhere between 0.05 and 0.30.
 		</p>
-		
 		<p>
-			To get this range of requirements to a more precise number, what we do is take the required ratio (0% seeded) for your download band, multiply it by <img style="vertical-align: middle" src="static/blank.gif" onload="if (this.src.substr(this.src.length-9,this.src.length) == 'blank.gif') { this.src = 'http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl=1-%5Cfrac%7BSeeding%7D%7BSnatched%7D&amp;chco=' + hexify(getComputedStyle(this.parentNode,null).color); }" />, and round it up to the required ratio (100% seeded) if need be. Therefore, your required ratio will always lie between the 0% seeded and 100% seeded requirements, depending on the percentage of torrents you are seeding. 
+			To get this range of requirements to a more precise number, what we do is take the required ratio (0% seeded) for your download band, multiply it by <img style="vertical-align: middle" src="static/blank.gif" alt="1 &#45; &#40;Seeding&#47;Snatched&#41;" onload="if (this.src.substr(this.src.length-9,this.src.length) == 'blank.gif') { this.src = 'http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl=1-%5Cfrac%7BSeeding%7D%7BSnatched%7D&amp;chco=' + hexify(getComputedStyle(this.parentNode,null).color); }" />, and round it up to the required ratio (100% seeded) if need be. Therefore, your required ratio will always lie between the 0% seeded and 100% seeded requirements, depending on the percentage of torrents you are seeding.
 		</p>
-		
 		<p>
-			In the formula, "snatched" is the number of <strong>non-deleted unique snatches</strong> (complete downloads) you have made (so if you snatch a torrent twice, it only counts once, and if it is then deleted, it's not counted at all). "Seeding" is the average number of torrents you've seeded over at least 72 hours in the past week. If you've seeded less than 72 hours in the past week, the "seeding" value will go down (which is bad). 
+			In the formula, "snatched" is the number of <strong>non-deleted unique snatches</strong> (complete downloads) you have made (so if you snatch a torrent twice, it only counts once, and if it is then deleted, it's not counted at all). "Seeding" is the average number of torrents you've seeded over at least 72 hours in the past week. If you've seeded less than 72 hours in the past week, the "seeding" value will go down (which is bad).
 		</p>
-		
 		<p>
-			Thus, if you have downloaded less than 20GB, and you are seeding 100% of your snatches, you will have <strong>no required ratio</strong>. If you have downloaded less than 5GB, then no matter what percentage of snatches you are seeding, you will again have no required ratio. 
+			Thus, if you have downloaded less than 20 GB, and you are seeding 100% of your snatches, you will have <strong>no required ratio</strong>. If you have downloaded less than 5 GB, then no matter what percentage of snatches you are seeding, you will have no required ratio.
 		</p>
-		
 		<p>
-			If you stop seeding for an entire week, your required ratio will be the "required ratio (0% seeded)" for your download band. Your required ratio will go down once you start seeding again. 
+			If you stop seeding for an entire week, your required ratio will be the "required ratio (0% seeded)" for your download band. Your required ratio will go down once you start seeding again.
 		</p>
-		
 		<p>
-			Take note how, as your download increases, the <strong>0% seeded and 100% seeded required ratios begin to taper together</strong>. They meet at 100GB of download, meaning that after you've downloaded 100GB, your ratio requirement will be 0.60, no matter what percentage of your snatches you're seeding. 
+			Take note how, as your download increases, the <strong>0% seeded and 100% seeded required ratios begin to taper together</strong>. They meet at 100 GB of download, meaning that after you have downloaded 100 GB, your ratio requirement will be 0.60, no matter what percentage of your snatches you are seeding. 
 		</p>
-		
+
 		<h3>Important information you should know</h3>
-		
 		<p>
-			If your ratio does not meet your required ratio, you will be put on ratio watch. You will have <strong>two weeks</strong> to get your ratio above your required ratio - <strong>failure to do so will result in your downloading privileges being automatically disabled</strong>. 
+			If your ratio does not meet your required ratio, you will be put on ratio watch. You will have <strong>two weeks</strong> to get your ratio above your required ratio - <strong>failure to do so will result in your downloading privileges being automatically disabled</strong>.
 		</p>
-		
 		<p>
-			If you download over 10GB while you're on ratio watch, your downloading privileges will be disabled. 
+			If you download over <span title="This is in base 2, so it is actually 10,240 MB">10 GB</span> while you are on ratio watch, your downloading privileges will be disabled.
 		</p>
-		
 		<p>
-			Everyone gets to download their first 5GB before ratio watch kicks in.
+			Everyone gets to download their first 5 GB before ratio watch kicks in.
 		</p>
-		
 		<p>
-			<b>To get out of ratio watch, you must either raise your ratio by uploading more, or lower your required ratio by seeding more. Your ratio MUST be above your required ratio.</b>
+			<strong>To get out of ratio watch, you must either raise your ratio by uploading more, or lower your required ratio by seeding more. Your ratio MUST be above your required ratio.</strong>
 		</p>
-		
 		<p>
-			If you have lost your downloading privileges, your new required ratio will be the 0% seeded ratio. You will re-gain your downloading privileges once your ratio is above that required ratio. 
+			If you have lost your downloading privileges, your new required ratio will be the 0% seeded ratio. You will re-gain your downloading privileges once your ratio is above that required ratio.
 		</p>
-		
 		<p>
-			The ratio watch system is completely automatic, and cannot be altered by staff. 
+			The ratio watch system is completely automatic and cannot be altered by staff.
 		</p>
 
 	</div>
diff --git a/sections/rules/requests.php b/sections/rules/requests.php
index 7fa141ff..683b1e1c 100644
--- a/sections/rules/requests.php
+++ b/sections/rules/requests.php
@@ -9,19 +9,19 @@
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>
-				<b>Do not make requests for torrents that break the rules.</b> It is your responsibility that the request follows the rules. Your request will be deleted and you will not get your bounty back. Requests cannot be more specific than the upload (and trumping) rules. For example, requesting an MP3 torrent with a log when the rules prohibit replacing an MP3 torrent without a log. Such a request asks for a duplicate to be uploaded. Exceptions: Requests made before the November 2008 rule change are not subject to deletion. However, you are advised to edit such older requests to comply with the rules.
+				<strong>Do not make requests for torrents that break the rules.</strong> It is your responsibility that the request follows the rules. Your request will be deleted, and you will not get your bounty back. Requests cannot be more specific than the upload (and trumping) rules. For example, requesting an MP3 torrent with a log when the rules prohibit replacing an MP3 torrent without a log. Such a request asks for a duplicate to be uploaded. Exceptions: Requests made before the November 2008 rule change are not subject to deletion. However, you are advised to edit such older requests to comply with the rules.
 			</li>
 			<li>
-				<b>Only one title (application, album, ...) per request.</b> No requests for multiple albums (discographies) or vague requirements. You may ask for multiple formats, but you cannot specify all of them. For example, you may ask for either a FLAC or V0, but not both formats. You may also make a list of albums by one artist that satisfies your request, but the request can be filled with only one album. Application requests can consist of only one application, but may span a range of different versions. However, such requests can be filled with only one version of that title.
+				<strong>Only one title (application, album, etc.) per request.</strong> No requests for multiple albums (e.g. discographies) or vague requirements. You may ask for multiple formats, but you cannot specify all of them. For example, you may ask for either a FLAC or V0 but not both formats. You may also make a list of albums by one artist that satisfies your request, but the request can be filled with only one album. Application requests can consist of only one application, but may span a range of different versions. However, such requests can be filled with only one version of that title.
 			</li>
 			<li>
-				<b>Do not unfill requests for trivial reasons.</b> If you did not specify in your request what you wanted (such as bitrates or a particular edition), do not unfill and later change the description. Do not unfill requests if you are unsure of what you are doing (e.g. the filled torrent may be a transcode, but you don't know how to tell). Ask for help from <a href="/staff.php">staff</a> in that case. You may unfill if the torrent doesn't fit your specifications stated clearly in the request.
+				<strong>Do not unfill requests for trivial reasons.</strong> If you did not specify in your request what you wanted (such as bitrates or a particular edition), do not unfill and later change the description. Do not unfill requests if you are unsure of what you are doing (e.g. the filled torrent may be a transcode, but you don't know how to tell). Ask for help from <a href="/staff.php">first-line support or staff</a> in that case. You may unfill the request if the torrent does not fit your specifications stated clearly in the request.
 			</li>
 			<li>
-				<b>All users must have an equal chance to fill a request.</b> Trading upload credit is not allowed. Abusing the request system to exchange favors for other users is not tolerated. That includes making specific requests for certain users (whether explicitly named or not). Making requests for releases, and then unfilling so that one particular user can fill the request is not allowed. If reported, both the requester and user filling the request will receive a warning and lose the request bounty.
+				<strong>All users must have an equal chance to fill a request.</strong> Trading upload credit is not allowed. Abusing the request system to exchange favors for other users is not tolerated. That includes making specific requests for certain users (whether explicitly named or not). Making requests for releases, and then unfilling so that one particular user can fill the request is not allowed. If reported, both the requester and user filling the request will receive a warning and lose the request bounty.
 			</li>
 			<li>
-				<b>No manipulation of the requester for bounty.</b> The bounty is a reward for helping other users&mdash;it should not be a ransom. Any user who refuses to fill a request unless the bounty is increased will face harsh punishment.
+				<strong>No manipulation of the requester for bounty.</strong> The bounty is a reward for helping other users&mdash;it should not be a ransom. Any user who refuses to fill a request unless the bounty is increased will face harsh punishment.
 			</li>
 		</ul>
 	</div>
diff --git a/sections/rules/rules.php b/sections/rules/rules.php
index 186d0aba..94a5a45e 100644
--- a/sections/rules/rules.php
+++ b/sections/rules/rules.php
@@ -9,54 +9,22 @@
 	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
-			<li>
-				All staff decisions must be respected. If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site. Complaining about staff decisions in public or otherwise disrespecting staff members will not be taken lightly.
-			</li>
-			<li>
-				Access to this website is a privilege, not a right, and it can be taken away from you for any reason.
-			</li>
-			<li>
-				One account per person per lifetime. Anyone creating additional accounts will be banned.
-			</li>
-			<li>
-				Avatars must not exceed 256 kB or be vertically longer than 400 pixels. Avatars must be safe for work, be entirely unoffensive, and cannot contain any nudity or religious imagery. Use common sense.
-			</li>
-			<li>
-				Do not post our .torrent files on other sites. Every .torrent file has your personal passkey embedded in it. The tracker will automatically disable your account if you share your torrent files with others. You will not get your account back. This doesn't prohibit you from sharing the content on other sites, but does prohibit you from sharing the .torrent file.
-			</li>
-			<li>
-				Any torrent you are seeding to this tracker must only have our tracker's URL in it. Adding another tracker's URL will cause incorrect data to be sent to our tracker, and will lead to your getting disabled for cheating.  Similarly, your client must have DHT and PEX disabled for all What.CD torrents.
-			</li>
-			<li>
-				This is a torrent site which promotes sharing amongst the community. If you are not willing to give back to the community what you take from it, this site is not for you. In other words, we expect you to have an acceptable share ratio. If you download a torrent, please, seed the copy you have until there are sufficient people seeding the torrent data before you stop.
-			</li>
-			<li>
-				Do not browse the site using proxies or TOR. The site will automatically alert us.  This includes VPNs with dynamic IP addresses.
-			</li>
-			<li>
-				Asking for invites to any site is not allowed anywhere on What.CD or our IRC network. Invites may be offered in the Invites forum, and nowhere else.
-			</li>
-			<li>
-				Trading and selling invites is strictly prohibited, as is offering them in public - this includes on any forum which is not a class-restricted section on an invitation-only torrent site.
-			</li>
-			<li>
-				Trading, selling, sharing, or giving away your account is prohibited. PM a mod to disable your account if you no longer want it.
-			</li>
-			<li>
-				You're completely responsible for the people you invite. If your invitees are caught cheating or trading/selling invites, not only will they be banned, so will you. Be careful who you invite. Invites are a precious commodity.
-			</li>
-			<li>
-				Be careful when sharing an IP or a computer with a friend if they have (or have had) an account. From then on your accounts will be inherently linked and if one of you violates the rules, both accounts will be disabled along with any other accounts linked by IP. This rule applies to logging into the site.
-			</li>
-			<li>
-				Attempting to find or exploit a bug in the site code is the worst possible offense you can commit. We have automatic systems in place for monitoring these activities, and committing them will result in the banning of you, your inviter, and your inviter's entire invite tree. 
-			</li>
-			<li>
-				We're a community. Working together is what makes this place what it is. There are well over a thousand new torrents uploaded every day and sadly the staff aren't psychic. If you come across something that violates a rule, report it and help us better organize the site for you.
-			</li>
-			<li>
-				We respect the wishes of other sites here, as we wish for them to do the same. Please refrain from posting links to or full names for sites that do not want to be mentioned.
-			</li>
+			<li>All staff decisions must be respected. If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site. Complaining about staff decisions in public or otherwise disrespecting staff members will not be taken lightly.</li>
+			<li>Access to this web site is a privilege, not a right, and it can be taken away from you for any reason.</li>
+			<li>One account per person per lifetime. Anyone creating additional accounts will be banned.</li>
+			<li>Avatars must not exceed 256 kB or be vertically longer than 400 pixels. Avatars must be safe for work, be entirely unoffensive, and cannot contain any nudity or religious imagery. Use common sense.</li>
+			<li>Do not post our .torrent files on other sites. Every .torrent file has your personal passkey embedded in it. The tracker will automatically disable your account if you share your torrent files with others. You will not get your account back. This doesn't prohibit you from sharing the content on other sites, but does prohibit you from sharing the .torrent file.</li>
+			<li>Any torrent you are seeding to this tracker must only have our tracker's URL in it. Adding another tracker's URL will cause incorrect data to be sent to our tracker, and will lead to your getting disabled for cheating.  Similarly, your client must have DHT and PEX (peer exchange) disabled for all What.CD torrents.</li>
+			<li>This is a torrent site which promotes sharing amongst the community. If you are not willing to give back to the community what you take from it, this site is not for you. In other words, we expect you to have an acceptable share ratio. If you download a torrent, please, seed the copy you have until there are sufficient people seeding the torrent data before you stop.</li>
+			<li>Do not browse the site using proxies or TOR. The site will automatically alert us.  This includes VPNs with dynamic IP addresses.</li>
+			<li>Asking for invites to any site is not allowed anywhere on What.CD or our IRC network. Invites may be offered in the Invites forum, and nowhere else.</li>
+			<li>Trading and selling invites is strictly prohibited, as is offering them in public - this includes on any forum which is not a class-restricted section on an invitation-only torrent site.</li>
+			<li>Trading, selling, sharing, or giving away your account is prohibited. If you no longer want your account, send a staff PM requesting that it be disabled.</li>
+			<li>You're completely responsible for the people you invite. If your invitees are caught cheating or trading/selling invites, not only will they be banned, so will you. Be careful who you invite. Invites are a precious commodity.</li>
+			<li>Be careful when sharing an IP address or a computer with a friend if they have (or have had) an account. From then on your accounts will be inherently linked and if one of you violates the rules, both accounts will be disabled along with any other accounts linked by IP. This rule applies to logging into the site.</li>
+			<li>Attempting to find or exploit a bug in the site code is the worst possible offense you can commit. We have automatic systems in place for monitoring these activities, and committing them will result in the banning of you, your inviter, and your inviter's entire invite tree.</li>
+			<li>We're a community. Working together is what makes this place what it is. There are well over a thousand new torrents uploaded every day and sadly the staff aren't psychic. If you come across something that violates a rule, report it and help us better organize the site for you.</li>
+			<li>We respect the wishes of other sites here, as we wish for them to do the same. Please refrain from posting links to or full names for sites that do not want to be mentioned.</li>
 		</ul>
 	</div>
 	<!-- END General Rules -->
diff --git a/sections/rules/upload.php b/sections/rules/upload.php
index 6ff5f780..dc163398 100644
--- a/sections/rules/upload.php
+++ b/sections/rules/upload.php
@@ -197,7 +197,7 @@
 				</li>
 				<li id="r2.1.7"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.7">2.1.7.</a> <strong>Use only the allowed container formats for audio files.</strong> Use .m4a and .mp4 for AAC, and .flac for FLAC only. All other formats should not be encapsulated in random containers (e.g., FLAC must not be in an Ogg container, MP3 must not be in an .m4a container, and so forth). Exceptions: DTS CD-sourced audio rips, although contained in WAV, should have the .dts extension (see <a href="#h2.7">2.7</a>).</li>
 				<li id="r2.1.8"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.8">2.1.8.</a> <strong>Music not sourced from vinyl must not contain pops, clicks, or skips.</strong> They will be deleted for rip/encode errors if reported. Music sourced from vinyl must follow the rules <a href="#h2.5">found here</a>.</li>
-				<li id="r2.1.9"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.9">2.1.9.</a> <strong>Freely available music is allowed.</strong> Uploaded music may be freely available on the web (come from official sources such as record labels, band websites, or the <a href="http://www.archive.org/index.php">Internet Archive</a>). Uploads can come from other torrent sites, but you are responsible for determining the audio quality of the music (i.e., that it is not transcoded, that it does not contain an edited log, that it is not a user compilation, etc.). Users are highly encouraged to provide a link to the source of their upload when uploading freely available music. However, this is not required and the lack of such a link to further information is not grounds for reporting a torrent. All freely available music must conform to both quality rules and formatting rules. This means it must be tagged correctly, not be a transcode, have separate tracks, and so forth. Freely available music uploads should have the "WEB" media format if no other source media (e.g., CD, DVD, etc.) can be established for the files.</li>
+				<li id="r2.1.9"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.9">2.1.9.</a> <strong>Freely available music is allowed.</strong> Uploaded music may be freely available on the web (come from official sources such as record labels, band web sites, or the <a href="http://www.archive.org/index.php">Internet Archive</a>). Uploads can come from other torrent sites, but you are responsible for determining the audio quality of the music (i.e., that it is not transcoded, that it does not contain an edited log, that it is not a user compilation, etc.). Users are highly encouraged to provide a link to the source of their upload when uploading freely available music. However, this is not required and the lack of such a link to further information is not grounds for reporting a torrent. All freely available music must conform to both quality rules and formatting rules. This means it must be tagged correctly, not be a transcode, have separate tracks, and so forth. Freely available music uploads should have the "WEB" media format if no other source media (e.g., CD, DVD, etc.) can be established for the files.</li>
 				<li id="r2.1.10"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.10">2.1.10.</a> <strong>Clearly label water-marked or voice-over releases.</strong> Watermarks or voice-overs must be clearly indicated in the torrent description. The torrent will be deleted for quality misrepresentation if this information is not noted.</li>
 				<li id="r2.1.11"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.11">2.1.11.</a> <strong>Music ripped from the radio (Satellite or FM), television, the web, or podcasts are not allowed.</strong> See <a href="wiki.php?action=article&amp;id=948">this wiki</a> for the difference between web rips and the WEB category.</li>
 				<li id="r2.1.12"><a href="#h2.1"><strong>&uarr;_</strong></a> <a href="#r2.1.12">2.1.12.</a> <strong>No unofficial audience recordings may be uploaded.</strong> These include but are not limited to AUD (Audience), IEM (In Ear Monitor), ALD (Assistive Listening Device), Mini-Disc, and Matrix-sourced recordings (see <a href="#r2.6.3">2.6.3</a>).</li>
@@ -589,11 +589,11 @@
 				</li>
 				<li id="r4.1.2"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.2">4.1.2.</a> <strong>All applications must come with a crack, keygen, or other method of ensuring that downloaders can install them easily.</strong> App torrents with keygens, cracks, or patches that do not work or torrents missing clear installation instructions will be deleted if reported. No exceptions.</li>
 				<li id="r4.1.3"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.3">4.1.3.</a> <strong>App releases must not be freely available tools.</strong> Application releases cannot be freely downloaded anywhere from any official source. Nor may you upload open source applications where the source code is available for free. Closed or shareware installers like Crossover Office are allowed. Note: If all official sources stop hosting and remove a freely available application and its source code from their site(s) due to varying reasons (i.e., legal concerns, dead development, etc.), the application ceases to be freely available. You may then upload it in that case.</li>
-				<li id="r4.1.4"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.4">4.1.4.</a> <strong>Release descriptions for applications must contain good information about the application.</strong> You should either have a small description of the program (either taken from its website or from an NFO file) or a link to the information -- but ideally both. Torrents missing this information will be deleted when reported.</li>
-				<li id="r4.1.5"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.5">4.1.5.</a> <strong>The torrent title must have a descriptive name.</strong> The torrent title should at least include the application name and release version. Optionally, you may include additional labels for operating system and method of circumvention (i.e., crack, patch, keygen, or serial). For example, "AcrylicApps Wallet v3.0.1.493 MacOSX Cracked."</li>
+				<li id="r4.1.4"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.4">4.1.4.</a> <strong>Release descriptions for applications must contain good information about the application.</strong> You should either have a small description of the program (either taken from its web site or from an NFO file) or a link to the information -- but ideally both. Torrents missing this information will be deleted when reported.</li>
+				<li id="r4.1.5"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.5">4.1.5.</a> <strong>The torrent title must have a descriptive name.</strong> The torrent title should at least include the application name and release version. Optionally, you may include additional labels for operating system and method of circumvention (e.g., crack, patch, keygen, or serial). For example, "AcrylicApps Wallet v3.0.1.493 MacOSX Cracked."</li>
 				<li id="r4.1.6"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.6">4.1.6.</a> <strong>Use relevant tags for your torrent.</strong> Add all applicable default <a href="?p=tag">Gazelle tags</a> to help downloaders find your torrent. The default tags are apps.mac for Mac applications, apps.windows for Windows applications, and apps.sound for audio applications. You may add additional tags if the default ones do not apply (such as apps.linux).</li>
 				<li id="r4.1.7"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.7">4.1.7.</a> <strong>Games of any kind are prohibited (see <a href="#r1.2.5">1.2.5</a>).</strong> </li>
-				<li id="r4.1.8"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.8">4.1.8.</a> <strong>Application "packs" are not allowed.</strong> That means no 0-day packs or "video utilities" compilations. Also, packaging multiple versions of the same application into a single torrent is not allowed (i.e., Adobe Acrobat 8 and Adobe Acrobat 9 in a single torrent). Exceptions: The applications are from the same company and an official release. For example, Adobe CS and Macromedia Studio packaged in one set.</li>
+				<li id="r4.1.8"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.8">4.1.8.</a> <strong>Application "packs" are not allowed.</strong> That means no 0-day packs or "video utilities" compilations. Also, packaging multiple versions of the same application into a single torrent is not allowed (e.g., Adobe Acrobat 8 and Adobe Acrobat 9 in a single torrent). Exceptions: The applications are from the same company and an official release. For example, Adobe CS and Macromedia Studio packaged in one set.</li>
 				<li id="r4.1.9"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.9">4.1.9.</a> <strong>Sound sample packs, template collections, and font collections are allowed if they are official releases, not freely available, and unarchived.</strong> Sound sample packs, template collections, and font collections must be official compilations and they must not be uploaded as an archive. The files contained inside the torrent must not be archived so that users can see what the pack contains. That means if sound sample packs are in WAV format, they must be uploaded as WAV. If the font collection, template collection, or sound sample pack was originally released as an archive, you must unpack the files before uploading them in a torrent. None of the contents in these packs and collections may be freely available.</li>
 				<li id="r4.1.10"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.10">4.1.10.</a> <strong>Application components such as plug-ins, add-ons, expansions, filters, and so forth may be uploaded in a collection if they correspond to a particular application.</strong> You may upload plug-ins, expansions, add-ons, filters, and other application components as collections provided they are compatible to a particular application and version. For example, you may not upload a megapack of all filters for Adobe Photoshop CS2, CS3, and CS4. But you may upload a pack of Adobe Photoshop CS4 filters.</li>
 				<li id="r4.1.11"><a href="#h4.1"><strong>&uarr;_</strong></a> <a href="#r4.1.11">4.1.11.</a> <strong>Collections of cracks, keygens or serials are not allowed.</strong> The crack, keygen, or serial for an application must be in a torrent with its corresponding application. It cannot be uploaded separately from the application.</li>
diff --git a/sections/tools/data/donation_log.php b/sections/tools/data/donation_log.php
index 8c252d02..16cd5fa0 100644
--- a/sections/tools/data/donation_log.php
+++ b/sections/tools/data/donation_log.php
@@ -47,9 +47,9 @@
 if (empty($_GET['search']) && !isset($_GET['page'])) {
 ?>
 <div class="box pad">
-	<img src="<?=$DonationTimeline?>" />
+	<img src="<?=$DonationTimeline?>" alt="Donation timeline. The &quot;y&quot; axis is donation amount." />
 </div>
-<br / >
+<br />
 <? } ?>
 <div>
 	<form class="search_form" name="donation_log" action="" method="get">
@@ -60,13 +60,13 @@
 					<input type="hidden" name="action" value="donation_log" />
 					<input type="text" name="search" size="60" value="<? if (!empty($_GET['search'])) { echo display_str($_GET['search']); } ?>" />
 					&nbsp;
-					<input type="submit" value="Search log" />
+					<input type="submit" value="Search donation log" />
 				</td>
 			</tr>
 		</table>	
 	</form>
 </div>
-<br / >
+<br />
 <div class="linkbox">
 <?
 	$Pages=get_pages($Page,$Results,DONATIONS_PER_PAGE,11) ;
@@ -95,4 +95,4 @@
 <div class="linkbox">
 	<?=$Pages?>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? show_footer(); ?>
diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php
index 071bc38a..84356983 100644
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@@ -9,9 +9,9 @@
 		$DB->query('DELETE FROM ip_bans WHERE ID='.$_POST['id']);
 		$Bans = $Cache->delete_value('ip_bans');
 	} else { //Edit & Create, Shared Validation
-		$Val->SetFields('start', '1','regex','You must inculde starting IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
-		$Val->SetFields('end', '1','regex','You must inculde ending IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
-		$Val->SetFields('notes', '1','string','You must inculde a note regarding the reason for the ban.');
+		$Val->SetFields('start', '1','regex','You must include the starting IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
+		$Val->SetFields('end', '1','regex','You must include the ending IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
+		$Val->SetFields('notes', '1','string','You must include the reason for the ban.');
 		$Err=$Val->ValidateForm($_POST); // Validate the form
 		if($Err){ error($Err); }
 	
@@ -98,13 +98,15 @@
 		</table>	
 	</form>
 </div>
-<br / >
+<br />
 
 <h3>Manage</h3>
 <?=$PageLinks?>
 <table width="100%">
 	<tr class="colhead">
-		<td colspan="2">Range</td>
+		<td colspan="2">
+			<span title="The IP addresses specified are &#42;inclusive&#42;. The left box is the beginning of the IP range, and the right box is the end of the IP range.">Range</span>
+		</td>
 		<td>Notes</td>
 		<td>Submit</td>
 	</tr>
@@ -122,7 +124,6 @@
 			<td>
 				<input type="submit" name="submit" value="Create" />
 			</td>
-			
 		</form>
 	</tr>
 <?
@@ -148,7 +149,6 @@
 				<input type="submit" name="submit" value="Edit" />
 				<input type="submit" name="submit" value="Delete" />
 			</td>
-			
 		</form>
 	</tr>
 <?
@@ -156,4 +156,4 @@
 ?>
 </table>
 <?=$PageLinks?>
-<? show_footer(); ?>
\ No newline at end of file
+<? show_footer(); ?>
diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php
index 2fed144c..23b62bb5 100644
--- a/sections/tools/managers/eb.php
+++ b/sections/tools/managers/eb.php
@@ -23,20 +23,20 @@
 		<td>Submit</td>
 	</tr>
 	<tr class="colhead">
-		<td colspan="4">Add To Email or Domain to Blacklist</td>
+		<td colspan="4">Add Email or Domain to Blacklist</td>
 	</tr>
 	<tr class="rowa">
 		<form class="add_form" name="email_blacklist" action="tools.php" method="post">
 			<input type="hidden" name="action" value="eb_alter" />
 			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 			<td>
-			<input type="text" name="email" size="30" />
+				<input type="text" name="email" size="30" />
 			</td>
 			<td colspan="2">
-			<input type="text" name="comment" size="60" />
+				<input type="text" name="comment" size="60" />
 			</td>
 			<td>
-			<input type="submit" value="Create" />
+				<input type="submit" value="Create" />
 			</td>
 		</form>
 	</tr>
@@ -45,23 +45,23 @@
 	<tr>
 		<form class="manage_form" name="email_blacklist" action="tools.php" method="post">
 			<td>
-			<input type="hidden" name="action" value="eb_alter" />
-			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-			<input type="hidden" name="id" value="<?=$ID?>" />
-			<input type="text" name="email" value="<?=display_str($Email)?>" size="30" />
+				<input type="hidden" name="action" value="eb_alter" />
+				<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+				<input type="hidden" name="id" value="<?=$ID?>" />
+				<input type="text" name="email" value="<?=display_str($Email)?>" size="30" />
 			</td>
 			<td>
-			<input type="text" name="comment" value="<?=display_str($Comment)?>" size="60" />
+				<input type="text" name="comment" value="<?=display_str($Comment)?>" size="60" />
 			</td>
 			<td><?=format_username($UserID, false, false, false)
 			?><br /><?=time_diff($Time, 1)
 			?></td>
 			<td>
-			<input type="submit" name="submit" value="Edit" />
-			<input type="submit" name="submit" value="Delete" />
+				<input type="submit" name="submit" value="Edit" />
+				<input type="submit" name="submit" value="Delete" />
 			</td>
 		</form>
 	</tr>
 	<?  }?>
 </table>
-<? show_footer();?>
\ No newline at end of file
+<? show_footer();?>
diff --git a/sections/user/user.php b/sections/user/user.php
index a607bf1d..437ee2fb 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -415,21 +415,21 @@ function check_paranoia_here($Setting) {
 <? }
 if (check_perms('users_view_invites')) {
 	if (!$InviterID) {
-		$Invited="<i>Nobody</i>";
+		$Invited='<span style="font-style: italic;">Nobody</span>';
 	} else {
 		$Invited='<a href="user.php?id='.$InviterID.'">'.$InviterName.'</a>';
 	}
 	
 ?>
 				<li>Invited By: <?=$Invited?></li>
-				<li>Invites: <? 
+				<li>Invites: <?
 				$DB->query("SELECT count(InviterID) FROM invites WHERE InviterID = '$UserID'");
 				list($Pending) = $DB->next_record();
-				if($DisableInvites) { 
-					echo 'X'; 
-				} else { 
-					echo number_format($Invites); 
-				} 
+				if($DisableInvites) {
+					echo 'X';
+				} else {
+					echo number_format($Invites);
+				}
 				echo " (".$Pending.")"
 				?></li>
 <?
@@ -548,7 +548,7 @@ function check_paranoia_here($Setting) {
    if (($Override=check_paranoia_here('uploads+'))) { ?>
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Uploaded: <?=number_format($Uploads)?> 
 					<? if(($Override=check_paranoia_here('uploads'))) { ?>[<a <?= $Override===2 ? 'class="paranoia_override"' :'' ?> href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>" title="View">View</a>]<?  if(check_perms('zip_downloader')) { ?> [<a href="torrents.php?action=redownload&amp;type=uploads&amp;userid=<?=$UserID?>" 
-																																																			onclick="return confirm('If you no longer have the content, your ratio WILL be affected, be sure to check the size of all albums before redownloading.');">Download</a>]<? } } ?>
+						onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all albums before redownloading.');">Download</a>]<? } } ?>
 				</li>
 <? }
    if (($Override=check_paranoia_here('uniquegroups+'))) { ?>
@@ -576,27 +576,27 @@ function check_paranoia_here($Setting) {
 <? if (($Override=check_paranoia_here('seeding+'))) { ?>
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Seeding: <?=number_format($Seeding)?> <?
 					if(($AOverride=check_paranoia_here('seeding'))) {
-						echo ((($Override=check_paranoia_here('snatched')) && $UniqueSnatched > 0 ) 
+						echo ((($Override=check_paranoia_here('snatched')) && $UniqueSnatched > 0 )
 							? '<span ' .($Override===2 ? 'class="paranoia_override" ' : '').' >(' . 100*min(1,round($Seeding/$UniqueSnatched,2)).'%)</span> '
 							: ''); ?>
 						[<a href="torrents.php?type=seeding&amp;userid=<?=$UserID?>" <?= $AOverride===2 ? 'class="paranoia_override"' :'' ?> title="View">View</a>]
-						<? if (check_perms('zip_downloader')) { ?> 
+						<? if (check_perms('zip_downloader')) { ?>
 							[<a href="torrents.php?action=redownload&amp;type=seeding&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all albums before redownloading.');">Download</a>]
 						<? } ?>
 					<?} ?>
 				</li>
 <? }
    if (($Override=check_paranoia_here('leeching+'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Leeching: <? echo number_format($Leeching); 
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Leeching: <? echo number_format($Leeching);
 				if(($Override=check_paranoia_here('leeching'))) { ?>
-					[<a <?= $Override===2 ? 'class="paranoia_override"' : ''?> href="torrents.php?type=leeching&amp;userid=<?=$UserID?>" title="View">View</a>] 
-				<? } 
+					[<a <?= $Override===2 ? 'class="paranoia_override"' : ''?> href="torrents.php?type=leeching&amp;userid=<?=$UserID?>" title="View">View</a>]
+				<? }
 					echo ($DisableLeech == 0 && check_perms('users_view_ips')) ? "<strong> (Disabled)</strong>" : ""?>
 				</li>
-<? } 
+<? }
 ?>
 <? if (($Override=check_paranoia_here('snatched+'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Snatched: <?=number_format($Snatched)?> 
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Snatched: <?=number_format($Snatched)?>
 <? 	if(($Override=check_perms('site_view_torrent_snatchlist', $Class))) { ?>
 					(<?= $Override === 2 ? '<span class="paranoia_override">'.number_format($UniqueSnatched).'</span>' :	number_format($UniqueSnatched) ?>)
 <?	} ?>
diff --git a/static/functions/iphone.js b/static/functions/iphone.js
index b19ff31e..9bad91ee 100644
--- a/static/functions/iphone.js
+++ b/static/functions/iphone.js
@@ -1,4 +1,4 @@
-// We had to sacrafice a bit of the beauty of this structure to accomodate OS 1.1
+// We had to sacrafice a bit of the beauty of this structure to accommodate OS 1.1
 // If/when we drop OS <2 just switch all onclick events to ontouchend events.
 
 var elements; // Shortcut to handle html elements
diff --git a/static/styles/anorex/style.css b/static/styles/anorex/style.css
index 1d89b1af..f78d85bf 100644
--- a/static/styles/anorex/style.css
+++ b/static/styles/anorex/style.css
@@ -171,7 +171,7 @@ ul.thin li { margin:0px 0px; padding:0px; }
 	outline: none;
 }
 
-#nav_index a { /* extraneous link which can be removed to accomodate for small screen resolutions - alt link is provided in the form of the logo */
+#nav_index a { /* extraneous link which can be removed to accommodate for small screen resolutions - alt link is provided in the form of the logo */
 	display: none;
 }
 
diff --git a/templates/invite.tpl b/templates/invite.tpl
index 6b238f49..7083d98a 100644
--- a/templates/invite.tpl
+++ b/templates/invite.tpl
@@ -1,6 +1,6 @@
 The user {{InviterName}} has invited you to join {{SITE_NAME}}, and has specified this address ({{Email}}) as your email address. If you do not know this person, please ignore this email, and do not reply.
 
-Please note that selling invites, trading invites, and giving invites away publicly (eg. on a forum) is strictly forbidden. If you have received your invite as a result of any of these things, do not bother signing up - you will be banned and lose your chances of ever signing up legitimately.
+Please note that selling invites, trading invites, and giving invites away publicly (e.g. on a forum) is strictly forbidden. If you have received your invite as a result of any of these things, do not bother signing up - you will be banned and lose your chances of ever signing up legitimately.
 
 To confirm your invite, click on the following link: