diff --git a/core/database.class.php b/core/database.class.php
index 2ee4db23..eb00e1ab 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -271,11 +271,13 @@ class Database {
 
 	/**
 	 * Meta info about the database engine
+	 * @var DBEngine
 	 */
 	private $engine = null;
 
 	/**
 	 * The currently active cache engine
+	 * @var CacheEngine
 	 */
 	public $cache = null;
 
diff --git a/core/extension.class.php b/core/extension.class.php
index b288e91f..9d881c80 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -140,9 +140,9 @@ abstract class FormatterExtension extends Extension {
  */
 abstract class DataHandlerExtension extends Extension {
 	public function onDataUpload(DataUploadEvent $event) {
-		global $user;
-
-		if(($supported_ext = $this->supported_ext($event->type)) && ($check_contents = $this->check_contents($event->tmpname))) {
+		$supported_ext = $this->supported_ext($event->type);
+		$check_contents = $this->check_contents($event->tmpname);
+		if($supported_ext && $check_contents) {
 			if(!move_upload_to_archive($event)) return;
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
 
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 26582333..8e21de8b 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -122,7 +122,7 @@ class Image {
 
 		if(SPEED_HAX) {
 			if(!$user->can("big_search") and count($tags) > 3) {
-				die("Anonymous users may only search for up to 3 tags at a time"); // FIXME: throw an exception?
+				throw new SCoreException("Anonymous users may only search for up to 3 tags at a time");
 			}
 		}
 
@@ -644,7 +644,7 @@ class Image {
 	 *      images table. Yes, MySQL does suck this much.
 	 */
 	private static function build_accurate_search_querylet($terms) {
-		global $config, $database;
+		global $database;
 
 		$tag_querylets = array();
 		$img_querylets = array();
@@ -804,7 +804,7 @@ class Image {
 	 * build_accurate_search_querylet() for a full explanation
 	 */
 	private static function build_ugly_search_querylet($terms) {
-		global $config, $database;
+		global $database;
 
 		$tag_querylets = array();
 		$img_querylets = array();
@@ -910,8 +910,6 @@ class Image {
 
 		// more than one positive tag, or more than zero negative tags
 		else {
-			$s_tag_array = array_map("sql_escape", $tag_search->variables);
-
 			$tag_id_array = array();
 			$tags_ok = true;
 			foreach($tag_search->variables as $tag) {
@@ -1113,7 +1111,6 @@ function move_upload_to_archive(DataUploadEvent $event) {
 	if(!@copy($event->tmpname, $target)) {
 		$errors = error_get_last(); // note: requires php 5.2
 		throw new UploadException("Failed to copy file from uploads ({$event->tmpname}) to archive ($target): {$errors['type']} / {$errors['message']}");
-		return false;
 	}
 	return true;
 }
diff --git a/core/user.class.php b/core/user.class.php
index 50034926..3adceadc 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -15,6 +15,9 @@ class User {
 	var $name;
 	var $email;
 	var $join_date;
+	var $passhash;
+
+	/* @var UserClass */
 	var $class;
 
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/core/util.inc.php b/core/util.inc.php
index f77b36b5..587f66a0 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -385,7 +385,13 @@ function make_http(/*string*/ $link) {
 /**
  * Make a form tag with relevant auth token and stuff
  *
- * @retval string
+ * @param target string
+ * @param method string
+ * @param multipart boolean
+ * @param form_id string
+ * @param onsubmit string
+ *
+ * @return string
  */
 function make_form($target, $method="POST", $multipart=False, $form_id="", $onsubmit="") {
 	global $user;
@@ -451,7 +457,7 @@ function captcha_get_html() {
 		}
 		else {
 			session_start();
-			$securimg = new Securimage();
+			//$securimg = new Securimage();
 			$base = get_base_href();
 			$captcha = "<br/><img src='$base/lib/securimage/securimage_show.php?sid=". md5(uniqid(time())) ."'>".
 				"<br/>CAPTCHA: <input type='text' name='code' value='' />";
@@ -1276,6 +1282,7 @@ function _sanitise_environment() {
 }
 
 function _get_themelet_files($_theme) {
+	$base_themelets = array();
 	if(file_exists('themes/'.$_theme.'/custompage.class.php')) $base_themelets[] = 'themes/'.$_theme.'/custompage.class.php';
 	$base_themelets[] = 'themes/'.$_theme.'/layout.class.php';
 	$base_themelets[] = 'themes/'.$_theme.'/themelet.class.php';
@@ -1406,7 +1413,7 @@ function _decaret($str) {
 }
 
 function _get_user() {
-	global $config, $database;
+	global $config;
 	$user = null;
 	if(get_prefixed_cookie("user") && get_prefixed_cookie("session")) {
 	    $tmp_user = User::by_session(get_prefixed_cookie("user"), get_prefixed_cookie("session"));
diff --git a/ext/admin/theme.php b/ext/admin/theme.php
index 64c18d2f..3eefdb11 100644
--- a/ext/admin/theme.php
+++ b/ext/admin/theme.php
@@ -14,9 +14,9 @@ class AdminPageTheme extends Themelet {
 
 	protected function button(/*string*/ $name, /*string*/ $action, /*boolean*/ $protected=false) {
 		$c_protected = $protected ? " protected" : "";
-		$html = make_form(make_link("admin/$action"), "POST", false, false, false, "admin$c_protected");
+		$html = make_form(make_link("admin/$action"), "POST", false, null, null, "admin$c_protected");
 		if($protected) {
-			$html .= "<input type='submit' id='$action' value='$name' disabled='true'>";
+			$html .= "<input type='submit' id='$action' value='$name' disabled='disabled'>";
 			$html .= "<input type='checkbox' onclick='$(\"#$action\").attr(\"disabled\", !$(this).is(\":checked\"))'>";
 		}
 		else {
diff --git a/ext/artists/main.php b/ext/artists/main.php
index 38c614f9..7aea77ad 100644
--- a/ext/artists/main.php
+++ b/ext/artists/main.php
@@ -143,7 +143,7 @@ class Artists extends Extension {
     }
     public function handle_commands($event)
     {
-        global $config, $page, $user;
+        global $page, $user;
 
         if($event->page_matches("artist"))
         {
diff --git a/ext/artists/theme.php b/ext/artists/theme.php
index 1e00cf31..c6d957a3 100644
--- a/ext/artists/theme.php
+++ b/ext/artists/theme.php
@@ -14,19 +14,11 @@ class ArtistsTheme extends Themelet {
 		";
 	}
 
-	public function display_artists(){
-		global $page;
-		
-		$page->set_title("Artists");
-		$page->set_heading("Artists");
-		$page->add_block(new Block("Artists", $html, "main", 10));
-		
-		//$this->display_paginator($page, "artist/list", null, $pageNumber, $totalPages);
-	}
-	
 	public function sidebar_options(/*string*/ $mode, $artistID=NULL, $is_admin=FALSE){
-		global $page;
-		
+		global $page, $user;
+
+		$html = "";
+
 		if($mode == "neutral"){
 			$html = "<form method='post' action='".make_link("artist/new_artist")."'>
 						".$user->get_auth_html()."
@@ -72,49 +64,52 @@ class ArtistsTheme extends Themelet {
 							<input type='hidden' name='artist_id' value='".$artistID."'>
 						</form>";
 		}
-		$page->add_block(new Block("Manage Artists", $html, "left", 10));
+
+		if($html) $page->add_block(new Block("Manage Artists", $html, "left", 10));
 	}
 
-        public function show_artist_editor($artist, $aliases, $members, $urls)
-        {
-            $artistName = $artist['name'];
-            $artistNotes = $artist['notes'];
-            $artistID = $artist['id'];
+		public function show_artist_editor($artist, $aliases, $members, $urls)
+		{
+			global $user;
 
-            // aliases
-            $aliasesString = "";
-            $aliasesIDsString = "";
-            foreach ($aliases as $alias)
-            {
-                $aliasesString .= $alias["alias_name"]." ";
-                $aliasesIDsString .= $alias["alias_id"]." ";
-            }
-            $aliasesString = rtrim($aliasesString);
-            $aliasesIDsString = rtrim($aliasesIDsString);
+			$artistName = $artist['name'];
+			$artistNotes = $artist['notes'];
+			$artistID = $artist['id'];
 
-            // members
-            $membersString = "";
-            $membersIDsString = "";
-            foreach ($members as $member)
-            {
-                $membersString .= $member["name"]." ";
-                $membersIDsString .= $member["id"]." ";
-            }
-            $membersString = rtrim($membersString);
-            $membersIDsString = rtrim($membersIDsString);
+			// aliases
+			$aliasesString = "";
+			$aliasesIDsString = "";
+			foreach ($aliases as $alias)
+			{
+				$aliasesString .= $alias["alias_name"]." ";
+				$aliasesIDsString .= $alias["alias_id"]." ";
+			}
+			$aliasesString = rtrim($aliasesString);
+			$aliasesIDsString = rtrim($aliasesIDsString);
 
-            // urls
-            $urlsString = "";
-            $urlsIDsString = "";
-            foreach ($urls as $url)
-            {
-                $urlsString .= $url["url"]."\n";
-                $urlsIDsString .= $url["id"]." ";
-            }
-            $urlsString = substr($urlsString, 0, strlen($urlsString) -1);
-            $urlsIDsString = rtrim($urlsIDsString);
+			// members
+			$membersString = "";
+			$membersIDsString = "";
+			foreach ($members as $member)
+			{
+				$membersString .= $member["name"]." ";
+				$membersIDsString .= $member["id"]." ";
+			}
+			$membersString = rtrim($membersString);
+			$membersIDsString = rtrim($membersIDsString);
 
-            $html =
+			// urls
+			$urlsString = "";
+			$urlsIDsString = "";
+			foreach ($urls as $url)
+			{
+				$urlsString .= $url["url"]."\n";
+				$urlsIDsString .= $url["id"]." ";
+			}
+			$urlsString = substr($urlsString, 0, strlen($urlsString) -1);
+			$urlsIDsString = rtrim($urlsIDsString);
+
+			$html =
 '
 			<form method="POST" action="'.make_link("artist/edited/".$artist['id']).'">
 				'.$user->get_auth_html().'
@@ -131,111 +126,113 @@ class ArtistsTheme extends Themelet {
 					<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 				</table>
 			</form>
-                
+				
 ';
 
-            global $page;
-            $page->add_block(new Block("Edit artist", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit artist", $html, "main", 10));
+		}
 	
 	public function new_artist_composer()
-        {
-            global $page;
+		{
+			global $page, $user;
 
-            $html = "<form action=".make_link("artist/create")." method='POST'>
+			$html = "<form action=".make_link("artist/create")." method='POST'>
 							".$user->get_auth_html()."
-                            <table>
-                                    <tr><td>Name:</td><td><input type='text' name='name' /></td></tr>
-                                    <tr><td>Aliases:</td><td><input type='text' name='aliases' /></td></tr>
-                                    <tr><td>Members:</td><td><input type='text' name='members' /></td></tr>
-                                    <tr><td>URLs:</td><td><textarea name='urls'></textarea></td></tr>
+							<table>
+									<tr><td>Name:</td><td><input type='text' name='name' /></td></tr>
+									<tr><td>Aliases:</td><td><input type='text' name='aliases' /></td></tr>
+									<tr><td>Members:</td><td><input type='text' name='members' /></td></tr>
+									<tr><td>URLs:</td><td><textarea name='urls'></textarea></td></tr>
 									<tr><td>Notes:</td><td><textarea name='notes'></textarea></td></tr>
-                                    <tr><td colspan='2'><input type='submit' value='Submit' /></td></tr>
-                            </table>
-            ";
+									<tr><td colspan='2'><input type='submit' value='Submit' /></td></tr>
+							</table>
+			";
 
-            $page->set_title("Artists");
-            $page->set_heading("Artists");
-            $page->add_block(new Block("Artists", $html, "main", 10));
+			$page->set_title("Artists");
+			$page->set_heading("Artists");
+			$page->add_block(new Block("Artists", $html, "main", 10));
 	}
 	
 	public function list_artists($artists, $pageNumber, $totalPages)
-        {
-            global $user, $page;
+		{
+			global $user, $page;
 
-            $html = "<table id='poolsList' class='zebra'>".
-                    "<thead><tr>".
-                    "<th>Name</th>".
-                    "<th>Type</th>".
-                    "<th>Last updater</th>".
-                    "<th>Posts</th>";
+			$html = "<table id='poolsList' class='zebra'>".
+					"<thead><tr>".
+					"<th>Name</th>".
+					"<th>Type</th>".
+					"<th>Last updater</th>".
+					"<th>Posts</th>";
 
 
-            if(!$user->is_anonymous()) $html .= "<th colspan='2'>Action</th>"; // space for edit link
-            
-            $html .= "</tr></thead>";
+			if(!$user->is_anonymous()) $html .= "<th colspan='2'>Action</th>"; // space for edit link
+			
+			$html .= "</tr></thead>";
 
-            $deletionLinkActionArray =
-                array('artist' => 'artist/nuke/'
-                    , 'alias' => 'artist/alias/delete/'
-                    , 'member' => 'artist/member/delete/'
-                );
+			$deletionLinkActionArray =
+				array('artist' => 'artist/nuke/'
+					, 'alias' => 'artist/alias/delete/'
+					, 'member' => 'artist/member/delete/'
+				);
 
-            $editionLinkActionArray =
-                array('artist' => 'artist/edit/'
-                    , 'alias' => 'artist/alias/edit/'
-                    , 'member' => 'artist/member/edit/'
-                );
+			$editionLinkActionArray =
+				array('artist' => 'artist/edit/'
+					, 'alias' => 'artist/alias/edit/'
+					, 'member' => 'artist/member/edit/'
+				);
 
-            $typeTextArray =
-                array('artist' => 'Artist'
-                    , 'alias' => 'Alias'
-                    , 'member' => 'Member'
-                );
+			$typeTextArray =
+				array('artist' => 'Artist'
+					, 'alias' => 'Alias'
+					, 'member' => 'Member'
+				);
 
-            foreach ($artists as $artist) {
-                if ($artist['type'] != 'artist')
-                    $artist['name'] = str_replace("_", " ", $artist['name']);
+			foreach ($artists as $artist) {
+				if ($artist['type'] != 'artist')
+					$artist['name'] = str_replace("_", " ", $artist['name']);
 
-                $elementLink = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['name'])."</a>";
-                $artist_link = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['artist_name'])."</a>";
-                $user_link = "<a href='".make_link("user/".$artist['user_name'])."'>".$artist['user_name']."</a>";
-                $edit_link = "<a href='".make_link($editionLinkActionArray[$artist['type']].$artist['id'])."'>Edit</a>";
-                $del_link = "<a href='".make_link($deletionLinkActionArray[$artist['type']].$artist['id'])."'>Delete</a>";
+				$elementLink = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['name'])."</a>";
+				//$artist_link = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['artist_name'])."</a>";
+				$user_link = "<a href='".make_link("user/".$artist['user_name'])."'>".$artist['user_name']."</a>";
+				$edit_link = "<a href='".make_link($editionLinkActionArray[$artist['type']].$artist['id'])."'>Edit</a>";
+				$del_link = "<a href='".make_link($deletionLinkActionArray[$artist['type']].$artist['id'])."'>Delete</a>";
 
-                $html .= "<tr>".
-                    "<td class='left'>".$elementLink;
+				$html .= "<tr>".
+					"<td class='left'>".$elementLink;
 
-                //if ($artist['type'] == 'member')
-                //    $html .= " (member of ".$artist_link.")";
+				//if ($artist['type'] == 'member')
+				//	$html .= " (member of ".$artist_link.")";
 
-                //if ($artist['type'] == 'alias')
-                //    $html .= " (alias for ".$artist_link.")";
+				//if ($artist['type'] == 'alias')
+				//	$html .= " (alias for ".$artist_link.")";
 
-                $html .= "</td>".
-                    "<td>".$typeTextArray[$artist['type']]."</td>".
-                    "<td>".$user_link."</td>".
-                    "<td>".$artist['posts']."</td>";
+				$html .= "</td>".
+					"<td>".$typeTextArray[$artist['type']]."</td>".
+					"<td>".$user_link."</td>".
+					"<td>".$artist['posts']."</td>";
 
-                if(!$user->is_anonymous()) $html .= "<td>".$edit_link."</td>";
-                if($user->is_admin()) $html .= "<td>".$del_link."</td>";
+				if(!$user->is_anonymous()) $html .= "<td>".$edit_link."</td>";
+				if($user->is_admin()) $html .= "<td>".$del_link."</td>";
 
-                $html .= "</tr>";
-            }
+				$html .= "</tr>";
+			}
 
-            $html .= "</tbody></table>";
+			$html .= "</tbody></table>";
 
-            $page->set_title("Artists");
-            $page->set_heading("Artists");
-            $page->add_block(new Block("Artists", $html, "main", 10));
+			$page->set_title("Artists");
+			$page->set_heading("Artists");
+			$page->add_block(new Block("Artists", $html, "main", 10));
 
-            $this->display_paginator($page, "artist/list", null, $pageNumber, $totalPages);
+			$this->display_paginator($page, "artist/list", null, $pageNumber, $totalPages);
 	}
 
-        public function show_new_alias_composer($artistID)
-        {
-            $html =
-            '<form method="POST" action='.make_link("artist/alias/add").'>
+		public function show_new_alias_composer($artistID)
+		{
+			global $user;
+
+			$html =
+			'<form method="POST" action='.make_link("artist/alias/add").'>
 				'.$user->get_auth_html().'
 				  <table>
 					<tr><td>Alias:</td><td><input type="text" name="aliases" />
@@ -243,256 +240,265 @@ class ArtistsTheme extends Themelet {
 					<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 				</table>
 			</form>		
-            ';
+			';
 
-            global $page;
-            $page->add_block(new Block("Artist Aliases", $html, "main", 20));
-        }
-        public function show_new_member_composer($artistID)
-        {
-            $html =
-            '   <form method="POST" action='.make_link("artist/member/add").'>					
+			global $page;
+			$page->add_block(new Block("Artist Aliases", $html, "main", 20));
+		}
+		public function show_new_member_composer($artistID)
+		{
+			global $user;
+
+			$html =
+			'   <form method="POST" action='.make_link("artist/member/add").'>					
 				'.$user->get_auth_html().'
 					<table>
 						<tr><td>Members:</td><td><input type="text" name="members" />
 											   <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
 						<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 					</table>
-                </form>
-            ';
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Artist members", $html, "main", 30));
-        }
+			global $page;
+			$page->add_block(new Block("Artist members", $html, "main", 30));
+		}
 
-        public function show_new_url_composer($artistID)
-        {
-            $html =
-            '   <form method="POST" action='.make_link("artist/url/add").'>					
+		public function show_new_url_composer($artistID)
+		{
+			global $user;
+
+			$html =
+			'   <form method="POST" action='.make_link("artist/url/add").'>					
 				'.$user->get_auth_html().'
 					<table>
 						<tr><td>URL:</td><td><textarea name="urls"></textarea>
 											   <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
 						<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 					</table>
-                </form>
-            ';
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Artist URLs", $html, "main", 40));
-        }
+			global $page;
+			$page->add_block(new Block("Artist URLs", $html, "main", 40));
+		}
 
-        public function show_alias_editor($alias)
-        {
-            $html =
-            '
-                <form method="POST" action="'.make_link("artist/alias/edited/".$alias['id']).'">
+		public function show_alias_editor($alias)
+		{
+			global $user;
+
+			$html =
+			'
+				<form method="POST" action="'.make_link("artist/alias/edited/".$alias['id']).'">
 					'.$user->get_auth_html().'
-                    <label for="alias">Alias:</label>
-                    <input type="text" name="alias" value="'.$alias['alias'].'" />
-                    <input type="hidden" name="aliasID" value="'.$alias['id'].'" />
-                    <input type="submit" value="Submit" />
-                </form>
-            ';
+					<label for="alias">Alias:</label>
+					<input type="text" name="alias" value="'.$alias['alias'].'" />
+					<input type="hidden" name="aliasID" value="'.$alias['id'].'" />
+					<input type="submit" value="Submit" />
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Edit Alias", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit Alias", $html, "main", 10));
+		}
 
-        public function show_url_editor($url)
-        {
-            $html =
-            '
-                <form method="POST" action="'.make_link("artist/url/edited/".$url['id']).'">
+		public function show_url_editor($url)
+		{
+			global $user;
+
+			$html =
+			'
+				<form method="POST" action="'.make_link("artist/url/edited/".$url['id']).'">
 					'.$user->get_auth_html().'
-                    <label for="url">URL:</label>
-                    <input type="text" name="url" value="'.$url['url'].'" />
-                    <input type="hidden" name="urlID" value="'.$url['id'].'" />
-                    <input type="submit" value="Submit" />
-                </form>
-            ';
+					<label for="url">URL:</label>
+					<input type="text" name="url" value="'.$url['url'].'" />
+					<input type="hidden" name="urlID" value="'.$url['id'].'" />
+					<input type="submit" value="Submit" />
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Edit URL", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit URL", $html, "main", 10));
+		}
 
-        public function show_member_editor($member)
-        {
-            $html =
-            '
-                <form method="POST" action="'.make_link("artist/member/edited/".$member['id']).'">
+		public function show_member_editor($member)
+		{
+			global $user;
+
+			$html =
+			'
+				<form method="POST" action="'.make_link("artist/member/edited/".$member['id']).'">
 					'.$user->get_auth_html().'
-                    <label for="member">Member name:</label>
-                    <input type="text" name="name" value="'.$member['name'].'" />
-                    <input type="hidden" name="memberID" value="'.$member['id'].'" />
-                    <input type="submit" value="Submit" />
-                </form>
-            ';
+					<label for="member">Member name:</label>
+					<input type="text" name="name" value="'.$member['name'].'" />
+					<input type="hidden" name="memberID" value="'.$member['id'].'" />
+					<input type="submit" value="Submit" />
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Edit Member", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit Member", $html, "main", 10));
+		}
 
 	public function show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin)
-        {
-            global $user, $event, $page;
+		{
+			global $page;
 
-            $artist_link = "<a href='".make_link("post/list/".$artist['name']."/1")."'>".str_replace("_", " ", $artist['name'])."</a>";
+			$artist_link = "<a href='".make_link("post/list/".$artist['name']."/1")."'>".str_replace("_", " ", $artist['name'])."</a>";
 
-            $html = "<table id='poolsList' class='zebra'>
-                    <thead>
-                        <tr>
-                            <th></th>
-                            <th></th>";
-            
-            if ($userIsLogged)
-                $html .= "<th></th>";
-
-            if ($userIsAdmin)
-                $html .= "<th></th>";
-
-            $html .= "  <tr>
-                    </thead>
-
-                    <tr>
-                        <td class='left'>Name:</td>
-                        <td class='left'>".$artist_link."</td>";
-            if ($userIsLogged) $html .= "<td></td>";
-            if ($userIsAdmin) $html .= "<td></td>";
-            $html .= "</tr>";
-
-            if (count($aliases) > 0)
-            {
-                $aliasViewLink = str_replace("_", " ", $aliases[0]['alias_name']); // no link anymore
-                $aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[0]['alias_id'])."'>Edit</a>";
-                $aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[0]['alias_id'])."'>Delete</a>";
-                
-                $html .= "<tr>
-                              <td class='left'>Aliases:</td>
-                              <td class='left'>".$aliasViewLink."</td>";
-                
-                if ($userIsLogged)
-                    $html .= "<td class='left'>".$aliasEditLink."</td>";
-
-                if ($userIsAdmin)
-                    $html .= "<td class='left'>".$aliasDeleteLink."</td>";
-                    
-                $html .= "</tr>";
-
-                if (count($aliases) > 1)
-                {
-                    for ($i = 1; $i < count($aliases); $i++)
-                    {
-                        $aliasViewLink = str_replace("_", " ", $aliases[$i]['alias_name']); // no link anymore
-                        $aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[$i]['alias_id'])."'>Edit</a>";
-                        $aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[$i]['alias_id'])."'>Delete</a>";
-
-                        $html .= "<tr>
-                                      <td class='left'>&nbsp;</td>
-                                      <td class='left'>".$aliasViewLink."</td>";
-                        if ($userIsLogged)
-                            $html .= "<td class='left'>".$aliasEditLink."</td>";
-                        if ($userIsAdmin)
-                            $html .= "<td class='left'>".$aliasDeleteLink."</td>";
-                            
-                        $html .= "</tr>";
-                    }
-                }
-            }
-
-            if (count($members) > 0)
-            {
-                $memberViewLink = str_replace("_", " ", $members[0]['name']); // no link anymore
-                $memberEditLink = "<a href='".make_link("artist/member/edit/".$members[0]['id'])."'>Edit</a>";
-                $memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[0]['id'])."'>Delete</a>";
-
-                $html .= "<tr>
-                            <td class='left'>Members:</td>
-                            <td class='left'>".$memberViewLink."</td>";
-                if ($userIsLogged)
-                    $html .= "<td class='left'>".$memberEditLink."</td>";
-                if ($userIsAdmin)
-                    $html .= "<td class='left'>".$memberDeleteLink."</td>";
-
-                $html .= "</tr>";
-
-                if (count($members) > 1)
-                {
-                    for ($i = 1; $i < count($members); $i++)
-                    {
-                        $memberViewLink = str_replace("_", " ", $members[$i]['name']); // no link anymore
-                        $memberEditLink = "<a href='".make_link("artist/member/edit/".$members[$i]['id'])."'>Edit</a>";
-                        $memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[$i]['id'])."'>Delete</a>";
-
-                        $html .= "<tr>
-                                <td class='left'>&nbsp;</td>
-                                <td class='left'>".$memberViewLink."</td>";
-                        if ($userIsLogged)
-                            $html .= "<td class='left'>".$memberEditLink."</td>";
-                        if ($userIsAdmin)
-                            $html .= "<td class='left'>".$memberDeleteLink."</td>";
-
-                        $html .= "</tr>";
-                    }
-                }
-            }
-
-            if (count($urls) > 0)
-            {
-                $urlViewLink = "<a href='".str_replace("_", " ", $urls[0]['url'])."' target='_blank'>".str_replace("_", " ", $urls[0]['url'])."</a>";
-                $urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[0]['id'])."'>Edit</a>";
-                $urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[0]['id'])."'>Delete</a>";
-
-                $html .= "<tr>
-                            <td class='left'>URLs:</td>
-                            <td class='left'>".$urlViewLink."</td>";
-                
-                if ($userIsLogged)
-                    $html .= "<td class='left'>".$urlEditLink."</td>";
-                    
-                if ($userIsAdmin)
-                    $html .= "<td class='left'>".$urlDeleteLink."</td>";
-                    
-                $html .= "</tr>";
-
-                if (count($urls) > 1)
-                {
-                    for ($i = 1; $i < count($urls); $i++)
-                    {
-                        $urlViewLink = "<a href='".str_replace("_", " ", $urls[$i]['url'])."' target='_blank'>".str_replace("_", " ", $urls[$i]['url'])."</a>";
-                        $urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[$i]['id'])."'>Edit</a>";
-                        $urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[$i]['id'])."'>Delete</a>";
-
-                        $html .= "<tr>
-                                <td class='left'>&nbsp;</td>
-                                <td class='left'>".$urlViewLink."</td>";
-                        if ($userIsLogged)
-                            $html .= "<td class='left'>".$urlEditLink."</td>";
-                            
-                        if ($userIsAdmin)
-                            $html .= "<td class='left'>".$urlDeleteLink."</td>";
-
-                        $html .= "</tr>";
-                    }
-                }
-            }
-
-            $html .=
-                    "<tr>
-                        <td class='left'>Notes:</td>
-                        <td class='left'>".$artist["notes"]."</td>";
-            if ($userIsLogged) $html .= "<td></td>";
-            if ($userIsAdmin) $html .= "<td></td>";
-            //TODO how will notes be edited? On edit artist? (should there be an editartist?) or on a editnotes?
-            //same question for deletion
-            $html .= "</tr>
-            </table>";
-
-            $page->set_title("Artist");
-            $page->set_heading("Artist");
-            $page->add_block(new Block("Artist", $html, "main", 10));
-			
+			$html = "<table id='poolsList' class='zebra'>
+					<thead>
+						<tr>
+							<th></th>
+							<th></th>";
 			
+			if ($userIsLogged)
+				$html .= "<th></th>";
+
+			if ($userIsAdmin)
+				$html .= "<th></th>";
+
+			$html .= "  <tr>
+					</thead>
+
+					<tr>
+						<td class='left'>Name:</td>
+						<td class='left'>".$artist_link."</td>";
+			if ($userIsLogged) $html .= "<td></td>";
+			if ($userIsAdmin) $html .= "<td></td>";
+			$html .= "</tr>";
+
+			if (count($aliases) > 0)
+			{
+				$aliasViewLink = str_replace("_", " ", $aliases[0]['alias_name']); // no link anymore
+				$aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[0]['alias_id'])."'>Edit</a>";
+				$aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[0]['alias_id'])."'>Delete</a>";
+				
+				$html .= "<tr>
+							  <td class='left'>Aliases:</td>
+							  <td class='left'>".$aliasViewLink."</td>";
+				
+				if ($userIsLogged)
+					$html .= "<td class='left'>".$aliasEditLink."</td>";
+
+				if ($userIsAdmin)
+					$html .= "<td class='left'>".$aliasDeleteLink."</td>";
+					
+				$html .= "</tr>";
+
+				if (count($aliases) > 1)
+				{
+					for ($i = 1; $i < count($aliases); $i++)
+					{
+						$aliasViewLink = str_replace("_", " ", $aliases[$i]['alias_name']); // no link anymore
+						$aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[$i]['alias_id'])."'>Edit</a>";
+						$aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[$i]['alias_id'])."'>Delete</a>";
+
+						$html .= "<tr>
+									  <td class='left'>&nbsp;</td>
+									  <td class='left'>".$aliasViewLink."</td>";
+						if ($userIsLogged)
+							$html .= "<td class='left'>".$aliasEditLink."</td>";
+						if ($userIsAdmin)
+							$html .= "<td class='left'>".$aliasDeleteLink."</td>";
+							
+						$html .= "</tr>";
+					}
+				}
+			}
+
+			if (count($members) > 0)
+			{
+				$memberViewLink = str_replace("_", " ", $members[0]['name']); // no link anymore
+				$memberEditLink = "<a href='".make_link("artist/member/edit/".$members[0]['id'])."'>Edit</a>";
+				$memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[0]['id'])."'>Delete</a>";
+
+				$html .= "<tr>
+							<td class='left'>Members:</td>
+							<td class='left'>".$memberViewLink."</td>";
+				if ($userIsLogged)
+					$html .= "<td class='left'>".$memberEditLink."</td>";
+				if ($userIsAdmin)
+					$html .= "<td class='left'>".$memberDeleteLink."</td>";
+
+				$html .= "</tr>";
+
+				if (count($members) > 1)
+				{
+					for ($i = 1; $i < count($members); $i++)
+					{
+						$memberViewLink = str_replace("_", " ", $members[$i]['name']); // no link anymore
+						$memberEditLink = "<a href='".make_link("artist/member/edit/".$members[$i]['id'])."'>Edit</a>";
+						$memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[$i]['id'])."'>Delete</a>";
+
+						$html .= "<tr>
+								<td class='left'>&nbsp;</td>
+								<td class='left'>".$memberViewLink."</td>";
+						if ($userIsLogged)
+							$html .= "<td class='left'>".$memberEditLink."</td>";
+						if ($userIsAdmin)
+							$html .= "<td class='left'>".$memberDeleteLink."</td>";
+
+						$html .= "</tr>";
+					}
+				}
+			}
+
+			if (count($urls) > 0)
+			{
+				$urlViewLink = "<a href='".str_replace("_", " ", $urls[0]['url'])."' target='_blank'>".str_replace("_", " ", $urls[0]['url'])."</a>";
+				$urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[0]['id'])."'>Edit</a>";
+				$urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[0]['id'])."'>Delete</a>";
+
+				$html .= "<tr>
+							<td class='left'>URLs:</td>
+							<td class='left'>".$urlViewLink."</td>";
+				
+				if ($userIsLogged)
+					$html .= "<td class='left'>".$urlEditLink."</td>";
+					
+				if ($userIsAdmin)
+					$html .= "<td class='left'>".$urlDeleteLink."</td>";
+					
+				$html .= "</tr>";
+
+				if (count($urls) > 1)
+				{
+					for ($i = 1; $i < count($urls); $i++)
+					{
+						$urlViewLink = "<a href='".str_replace("_", " ", $urls[$i]['url'])."' target='_blank'>".str_replace("_", " ", $urls[$i]['url'])."</a>";
+						$urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[$i]['id'])."'>Edit</a>";
+						$urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[$i]['id'])."'>Delete</a>";
+
+						$html .= "<tr>
+								<td class='left'>&nbsp;</td>
+								<td class='left'>".$urlViewLink."</td>";
+						if ($userIsLogged)
+							$html .= "<td class='left'>".$urlEditLink."</td>";
+							
+						if ($userIsAdmin)
+							$html .= "<td class='left'>".$urlDeleteLink."</td>";
+
+						$html .= "</tr>";
+					}
+				}
+			}
+
+			$html .=
+					"<tr>
+						<td class='left'>Notes:</td>
+						<td class='left'>".$artist["notes"]."</td>";
+			if ($userIsLogged) $html .= "<td></td>";
+			if ($userIsAdmin) $html .= "<td></td>";
+			//TODO how will notes be edited? On edit artist? (should there be an editartist?) or on a editnotes?
+			//same question for deletion
+			$html .= "</tr>
+			</table>";
+
+			$page->set_title("Artist");
+			$page->set_heading("Artist");
+			$page->add_block(new Block("Artist", $html, "main", 10));
+
 			//we show the images for the artist
 			$artist_images = "";
 			foreach($images as $image) {
diff --git a/ext/blotter/theme.php b/ext/blotter/theme.php
index 4c35db3b..872f550a 100644
--- a/ext/blotter/theme.php
+++ b/ext/blotter/theme.php
@@ -133,7 +133,7 @@ class BlotterTheme extends Themelet {
 			// Reset variables:
 			$i_open = "";
 			$i_close = "";
-			$id = $entries[$i]['id'];
+			//$id = $entries[$i]['id'];
 			$messy_date = $entries[$i]['entry_date'];
 			$clean_date = date("m/d/y", strtotime($messy_date));
 			$entry_text = $entries[$i]['entry_text'];
@@ -144,8 +144,6 @@ class BlotterTheme extends Themelet {
 			$entries_list .= "<li>{$i_open}{$clean_date} - {$entry_text}{$i_close}</li>";			
 		}
 
-		$out_text = "";
-		$in_text = "";
 		$pos_break = "";
 		$pos_align = "text-align: right; position: absolute; right: 0px;";
 
diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index 2cab0f46..cf58e4a3 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -30,7 +30,7 @@ class BulkAdd extends Extension {
 	public function onCommand(CommandEvent $event) {
 		if($event->cmd == "help") {
 			print "  bulk-add [directory]\n";
-			print "    Import this directory\n\n";
+			print "	Import this directory\n\n";
 		}
 		if($event->cmd == "bulk-add") {
 			if(count($event->args) == 1) {
@@ -53,6 +53,7 @@ class BulkAdd extends Extension {
 		if(!array_key_exists('extension', $pathinfo)) {
 			throw new UploadException("File has no extension");
 		}
+		$metadata = array();
 		$metadata['filename'] = $pathinfo['basename'];
 		$metadata['extension'] = $pathinfo['extension'];
 		$metadata['tags'] = $tags;
@@ -65,8 +66,6 @@ class BulkAdd extends Extension {
 	}
 
 	private function add_dir(/*string*/ $base, $subdir="") {
-		global $page;
-
 		if(!is_dir($base)) {
 			$this->theme->add_status("Error", "$base is not a directory");
 			return;
diff --git a/ext/bulk_add_csv/main.php b/ext/bulk_add_csv/main.php
index fd177846..4ff15773 100644
--- a/ext/bulk_add_csv/main.php
+++ b/ext/bulk_add_csv/main.php
@@ -33,7 +33,7 @@ class BulkAddCSV extends Extension {
 	public function onCommand(CommandEvent $event) {
 		if($event->cmd == "help") {
 			print "  bulk-add-csv [/path/to.csv]\n";
-			print "    Import this .csv file (refer to documentation)\n\n";
+			print "	Import this .csv file (refer to documentation)\n\n";
 		}
 		if($event->cmd == "bulk-add-csv") {
 			global $user;
@@ -62,6 +62,7 @@ class BulkAddCSV extends Extension {
 		if(!array_key_exists('extension', $pathinfo)) {
 			throw new UploadException("File has no extension");
 		}
+		$metadata = array();
 		$metadata['filename'] = $pathinfo['basename'];
 		$metadata['extension'] = $pathinfo['extension'];
 		$metadata['tags'] = $tags;
@@ -82,8 +83,6 @@ class BulkAddCSV extends Extension {
 	}
 
 	private function add_csv(/*string*/ $csvfile) {
-		global $page;
-
 		if(!file_exists($csvfile)) {
 			$this->theme->add_status("Error", "$csvfile not found");
 			return;
diff --git a/ext/bulk_remove/main.php b/ext/bulk_remove/main.php
index 73bcbb8e..2e609386 100644
--- a/ext/bulk_remove/main.php
+++ b/ext/bulk_remove/main.php
@@ -12,7 +12,7 @@
 
 class BulkRemove extends Extension {
 	public function onPageRequest(PageRequestEvent $event) {
-		global $page, $user;
+		global $user;
 		if($event->page_matches("bulk_remove") && $user->is_admin() && $user->check_auth_token()) {
 			if ($event->get_arg(0) == "confirm") $this->do_bulk_remove(); 
 			else $this->show_confirm();
@@ -20,7 +20,7 @@ class BulkRemove extends Extension {
 	}
  
 	public function onAdminBuilding(AdminBuildingEvent $event) {
-		global $page, $user;
+		global $page;
 		$html = "<b>Be extremely careful when using this!</b><br>
                     Once an image is removed there is no way to recover it so it is recommended that
                     you first take when removing a large amount of images.<br>
@@ -83,10 +83,10 @@ class BulkRemove extends Extension {
             
             
             // if no images were found with the given info
-            if (count($images_for_removal) == 0 && $html == "")
+            if (count($images_for_removal) == 0)
                 $error = "No images selected for removal";
             
-            var_dump($tags_arr); 
+            //var_dump($tags_arr);
             return array(
                 "error" => $error, 
                 "images_for_removal" => $images_for_removal);
@@ -119,6 +119,7 @@ class BulkRemove extends Extension {
         
         private function do_bulk_remove()
         {
+            global $page;
             // display error if user didn't go through admin board
             if (!isset($_POST["bulk_remove_images"])) {
                 $page->add_block(new Block("Bulk Remove Error", 
diff --git a/ext/chatbox/main.php b/ext/chatbox/main.php
index 9c48ce40..fc48cac1 100644
--- a/ext/chatbox/main.php
+++ b/ext/chatbox/main.php
@@ -13,7 +13,7 @@ class Chatbox extends Extension {
 		global $page, $user;
 
 		// Adds header to enable chatbox
-		$root = make_http();
+		$root = get_base_href();
 		$yPath = "$root/ext/chatbox/";
 		$page->add_html_header("
 				<script src=\"$root/ext/chatbox/js/jquery.js\" type=\"text/javascript\"></script>
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index ba4d12b4..7821b68c 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -244,7 +244,7 @@ class CommentListTheme extends Themelet {
 
 		$hb = ($comment->owner_class == "hellbanned" ? "hb" : "");
 		if($trim) {
-			return "
+			$html = "
 			<div class=\"comment $hb\">
 				$h_userlink: $h_comment
 				<a href=\"".make_link("post/view/$i_image_id#c$i_comment_id")."\">&gt;&gt;&gt;</a>
@@ -263,7 +263,7 @@ class CommentListTheme extends Themelet {
 			$h_del = $user->can("delete_comment") ?
 				' - <a onclick="return confirm(\'Delete comment by '.$h_name.':\\n'.$stripped_nonl.'\');" '.
 				'href="'.make_link('comment/delete/'.$i_comment_id.'/'.$i_image_id).'">Del</a>' : '';
-			return "
+			$html = "
 				<div class=\"comment $hb\" id=\"c$i_comment_id\">
 					<div class=\"info\">
 					$h_avatar
@@ -273,7 +273,7 @@ class CommentListTheme extends Themelet {
 				</div>
 			";
 		}
-		return "";
+		return $html;
 	}
 
 	protected function build_postbox(/*int*/ $image_id) {
diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index 49180ca8..24c62c55 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -206,7 +206,7 @@ class CronUploader extends Extension {
 	
 	/**
 	 * Returns amount of files & total size of dir.
-	 * @param unknown $path
+	 * @param $path string
 	 * @return multitype:number
 	 */
 	function scan_dir($path){
@@ -227,7 +227,7 @@ class CronUploader extends Extension {
 	
 	/**
 	 * Uploads the image & handles everything
-	 * @param number $upload_count to upload a non-config amount of imgs
+	 * @param $upload_count int to upload a non-config amount of imgs
 	 * @return boolean returns true if the upload was successful
 	 */
 	public function process_upload($upload_count = 0) {
@@ -254,11 +254,11 @@ class CronUploader extends Extension {
 			
 			try {
 				$this->add_image($img[0], $img[1], $img[2]);
-				$newPath = $this->move_uploaded($img[0], $img[1], false);
+				$this->move_uploaded($img[0], $img[1], false);
 				
 			}
 			catch (Exception $e) {
-				$newPath = $this->move_uploaded($img[0], $img[1], true);
+				$this->move_uploaded($img[0], $img[1], true);
 			}
 			
 			// Remove img from queue array
@@ -295,37 +295,17 @@ class CronUploader extends Extension {
 		$this->add_upload_info($info . "Image \"$filename\" moved from queue to \"$newPath\".");
 	}
 
-	 /**
-	 * moves a directory up or gets the directory of a file
-	 *
-	 * @param string $path	Path to modify
-	 * @param int $depth	Amount of directories to go up
-	 * @return unknown		Path to correct Directory
-	 */
-	private function move_directory_up($path, $depth=1)
-	{
-		$path = str_replace("//", "/", $path);
-		$array = explode("/", $path);
-		
-		for ($i = 0; $i < $depth; $i++) {
-			$to_remove = count($array) -1; // Gets number of element to remove
-			unset($array[$to_remove]);
-		}
-	
-		return implode("/", $array);
-	}
-	
 	/**
 	 * Generate the necessary DataUploadEvent for a given image and tags.
 	 */
 	private function add_image($tmpname, $filename, $tags) {
-		global $user, $image;
 		assert ( file_exists ( $tmpname ) );
 		
 		$pathinfo = pathinfo ( $filename );
 		if (! array_key_exists ( 'extension', $pathinfo )) {
 			throw new UploadException ( "File has no extension" );
 		}
+		$metadata = array();
 		$metadata ['filename'] = $pathinfo ['basename'];
 		$metadata ['extension'] = $pathinfo ['extension'];
 		$metadata ['tags'] = ""; // = $tags; doesn't work when not logged in here
@@ -343,12 +323,9 @@ class CronUploader extends Extension {
 		// Set tags
 		$img = Image::by_id($event->image_id);
 		$img->set_tags($tags);
-		
 	}
 	
 	private function generate_image_queue($base = "", $subdir = "") {
-		global $config;
-		
 		if ($base == "")
 			$base = $this->root_dir . "/queue";
 		
@@ -391,8 +368,9 @@ class CronUploader extends Extension {
 	
 	/**
 	 * Adds a message to the info being published at the end
-	 * @param string $text
-	 * @param int $addon Enter a value to modify an existing value (enter value number)
+	 * @param $text string
+	 * @param $addon int Enter a value to modify an existing value (enter value number)
+	 * @return int
 	 */
 	private function add_upload_info($text, $addon = 0) {
 		$info = $this->upload_info;
@@ -409,7 +387,7 @@ class CronUploader extends Extension {
 		
 		// else if addon function is used, select the line & modify it
 		$lines = substr($info, "\n"); // Seperate the string to array in lines
-		$lines[$addon] = "$line[$addon] $text"; // Add the content to the line
+		$lines[$addon] = "$lines[$addon] $text"; // Add the content to the line
 		$this->upload_info = implode("\n", $lines); // Put string back together & update
 		
 		return $addon; // Return line number
@@ -419,7 +397,7 @@ class CronUploader extends Extension {
 	 * This is run at the end to display & save the log.
 	 */
 	private function handle_log() {
-		global $page, $config;
+		global $page;
 		
 		// Display message
 		$page->set_mode("data");
@@ -437,4 +415,4 @@ class CronUploader extends Extension {
 		file_put_contents ($log_path, $content);
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/ext/danbooru_api/main.php b/ext/danbooru_api/main.php
index 2ba1b82d..987ee8c4 100644
--- a/ext/danbooru_api/main.php
+++ b/ext/danbooru_api/main.php
@@ -106,9 +106,6 @@ class DanbooruApi extends Extension {
 
 			if($user->can("create_image"))
 			{
-				$file = null;
-				$filename = "";
-				$source = "";
 				if(isset($_FILES['file']))
 				{	// A file was POST'd in
 					$file = $_FILES['file']['tmp_name'];
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index d79cfbed..fdd59c4e 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -21,6 +21,7 @@ function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
 class ExtensionInfo {
 	var $ext_name, $name, $link, $author, $email;
 	var $description, $documentation, $version, $visibility;
+	var $enabled;
 
 	function __construct($main) {
 		$matches = array();
@@ -131,7 +132,7 @@ class ExtManager extends Extension {
 	public function onCommand(CommandEvent $event) {
 		if($event->cmd == "help") {
 			print "  disable-all-ext\n";
-			print "    disable all extensions\n\n";
+			print "	disable all extensions\n\n";
 		}
 		if($event->cmd == "disable-all-ext") {
 			$this->write_config(array());
@@ -167,6 +168,7 @@ class ExtManager extends Extension {
 
 	private function set_things($settings) {
 		$core = explode(",", CORE_EXTS);
+		$extras = array();
 
 		foreach(glob("ext/*/main.php") as $main) {
 			$matches = array();
diff --git a/ext/favorites/main.php b/ext/favorites/main.php
index fb8ba57a..10242e53 100644
--- a/ext/favorites/main.php
+++ b/ext/favorites/main.php
@@ -35,7 +35,7 @@ class Favorites extends Extension {
 	}
 
 	public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
-		global $database, $page, $user;
+		global $database, $user;
 		if(!$user->is_anonymous()) {
 			$user_id = $user->id;
 			$image_id = $event->image->id;
@@ -51,7 +51,7 @@ class Favorites extends Extension {
 	public function onDisplayingImage(DisplayingImageEvent $event) {
 		$people = $this->list_persons_who_have_favorited($event->image);
 		if(count($people) > 0) {
-			$html = $this->theme->display_people($people);
+			$this->theme->display_people($people);
 		}
 	}
 
@@ -88,7 +88,7 @@ class Favorites extends Extension {
 			in_array('favorite_action', $_POST) &&
 			(($_POST['favorite_action'] == "set") || ($_POST['favorite_action'] == "unset"))
 		) {
-			send_event(new FavoriteSetEvent($event->image_id, $user, ($_POST['favorite_action'] == "set")));
+			send_event(new FavoriteSetEvent($event->image->id, $user, ($_POST['favorite_action'] == "set")));
 		}
 	}
 
diff --git a/ext/handle_archive/main.php b/ext/handle_archive/main.php
index a01589f8..f4dfe3dc 100644
--- a/ext/handle_archive/main.php
+++ b/ext/handle_archive/main.php
@@ -50,11 +50,11 @@ class ArchiveFileHandler extends Extension {
 		assert(file_exists($tmpname));
 
 		try {
-			global $user;
 			$pathinfo = pathinfo($filename);
 			if(!array_key_exists('extension', $pathinfo)) {
 				throw new UploadException("File has no extension");
 			}
+			$metadata = array();
 			$metadata['filename'] = $pathinfo['basename'];
 			$metadata['extension'] = $pathinfo['extension'];
 			$metadata['tags'] = $tags;
@@ -69,8 +69,6 @@ class ArchiveFileHandler extends Extension {
 
 	// copied from bulk add extension
 	private function add_dir($base, $subdir="") {
-		global $page;
-
 		$list = "";
 
 		$dir = opendir("$base/$subdir");
diff --git a/ext/handle_flash/main.php b/ext/handle_flash/main.php
index e59b8892..88becce7 100644
--- a/ext/handle_flash/main.php
+++ b/ext/handle_flash/main.php
@@ -17,26 +17,17 @@ class FlashFileHandler extends DataHandlerExtension {
 	}
 
 	protected function create_image_from_data(/*string*/ $filename, /*array*/ $metadata) {
-		global $config;
-
 		$image = new Image();
 
 		$image->filesize  = $metadata['size'];
-		$image->hash      = $metadata['hash'];
+		$image->hash	  = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
 		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
-		// redundant, since getimagesize() works on SWF o_O
-//		$rect = $this->swf_get_bounds($filename);
-//		if(is_null($rect)) {
-//			return $null;
-//		}
-//		$image->width = $rect[1];
-//		$image->height = $rect[3];
-
-		if(!($info = getimagesize($filename))) return null;
+		$info = getimagesize($filename);
+		if(!$info) return null;
 
 		$image->width = $info[0];
 		$image->height = $info[1];
@@ -45,61 +36,14 @@ class FlashFileHandler extends DataHandlerExtension {
 	}
 
 	protected function check_contents(/*string*/ $file) {
-		if(!file_exists($file)) return false;
+		if (!file_exists($file)) return false;
 
 		$fp = fopen($file, "r");
 		$head = fread($fp, 3);
 		fclose($fp);
-		if(!in_array($head, array("CWS", "FWS"))) return false;
+		if (!in_array($head, array("CWS", "FWS"))) return false;
 
 		return true;
 	}
-
-	private function str_to_binarray(/*string*/ $string) {
-		$binary = array();
-		$length = strlen($string);
-		for($j=0; $j<$length; $j++) {
-			$c = ord($string[$j]);
-			for($i=7; $i>=0; $i--) {
-				$binary[] = ($c >> $i) & 0x01;
-			}
-		}
-		return $binary;
-	}
-
-	private function binarray_to_int($binarray, $start=0, $length=32) {
-		$int = 0;
-		for($i=$start; $i<$start + $length; $i++) {
-			$int = $int << 1;
-			$int = $int + ($binarray[$i] == "1" ? 1 : 0);
-		}
-		return $int;
-	}
-
-	private function swf_get_bounds(/*string*/ $filename) {
-		$fp = fopen($filename, "r");
-		$head = fread($fp, 3);
-		$version = fread($fp, 1);
-		$length = fread($fp, 4);
-
-		if($head == "FWS") {
-			$data = fread($fp, 16);
-		}
-		else if($head == "CWS") {
-			$data = fread($fp, 128*1024);
-			$data = gzuncompress($data);
-			$data = substr($data, 0, 16);
-		}
-
-		$bounds = array();
-		$rect_bin = $this->str_to_binarray($data);
-		$nbits = $this->binarray_to_int($rect_bin, 0, 5);
-		$bounds[] = $this->binarray_to_int($rect_bin, 5 + 0 * $nbits, $nbits) / 20;
-		$bounds[] = $this->binarray_to_int($rect_bin, 5 + 1 * $nbits, $nbits) / 20;
-		$bounds[] = $this->binarray_to_int($rect_bin, 5 + 2 * $nbits, $nbits) / 20;
-		$bounds[] = $this->binarray_to_int($rect_bin, 5 + 3 * $nbits, $nbits) / 20;
-
-		return $bounds;
-	}
 }
 ?>
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 518f1a47..07fa97ec 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -36,7 +36,7 @@ class IcoFileHandler extends Extension {
 	}
 
 	public function onPageRequest(PageRequestEvent $event) {
-		global $config, $database, $page;
+		global $page;
 		if($event->page_matches("get_ico")) {
 			$id = int_escape($event->get_arg(0));
 			$image = Image::by_id($id);
@@ -56,11 +56,8 @@ class IcoFileHandler extends Extension {
 	}
 
 	private function create_image_from_data($filename, $metadata) {
-		global $config;
-
 		$image = new Image();
 
-		$info = "";
 		$fp = fopen($filename, "r");
 		$header = unpack("snull/stype/scount", fread($fp, 6));
 
diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php
index 956ad322..dd362055 100644
--- a/ext/handle_ico/test.php
+++ b/ext/handle_ico/test.php
@@ -6,8 +6,8 @@ class IcoHandlerTest extends ShimmieWebTestCase {
 		$this->assert_response(302);
 		$this->log_out();
 
-		$raw = $this->get_page("post/view/$image_id"); // test for no crash
-		$raw = $this->get_page("get_ico/$image_id"); // test for no crash
+		$this->get_page("post/view/$image_id"); // test for no crash
+		$this->get_page("get_ico/$image_id"); // test for no crash
 
 		$this->log_in_as_admin();
 		$this->delete_image($image_id);
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 2dadfc34..0ee4ca69 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -14,22 +14,20 @@ class PixelFileHandler extends DataHandlerExtension {
 	}
 
 	protected function create_image_from_data(/*string*/ $filename, /*array*/ $metadata) {
-		global $config;
-
 		$image = new Image();
 
-		$info = "";
-		if(!($info = getimagesize($filename))) return null;
+		$info = getimagesize($filename);
+		if(!$info) return null;
 
 		$image->width = $info[0];
 		$image->height = $info[1];
 
 		$image->filesize  = $metadata['size'];
-		$image->hash      = $metadata['hash'];
+		$image->hash	  = $metadata['hash'];
 		$image->filename  = (($pos = strpos($metadata['filename'],'?')) !== false) ? substr($metadata['filename'],0,$pos) : $metadata['filename'];
-		$image->ext       = (($pos = strpos($metadata['extension'],'?')) !== false) ? substr($metadata['extension'],0,$pos) : $metadata['extension'];
+		$image->ext	   = (($pos = strpos($metadata['extension'],'?')) !== false) ? substr($metadata['extension'],0,$pos) : $metadata['extension'];
 		$image->tag_array = Tag::explode($metadata['tags']);
-		$image->source    = $metadata['source'];
+		$image->source	= $metadata['source'];
 
 		return $image;
 	}
@@ -52,9 +50,10 @@ class PixelFileHandler extends DataHandlerExtension {
 	}
 
 	protected function create_thumb_force(/*string*/ $hash) {
+		global $config;
+
 		$inname  = warehouse_path("images", $hash);
 		$outname = warehouse_path("thumbs", $hash);
-		global $config;
 
 		$ok = false;
 
@@ -165,7 +164,7 @@ class PixelFileHandler extends DataHandlerExtension {
 			if($width > $height*5) $width = $height*5;
 			if($height > $width*5) $height = $width*5;
 
-			$image = imagecreatefromstring($this->read_file($tmpname));
+			$image = imagecreatefromstring(file_get_contents($tmpname));
 			$tsize = get_thumbnail_size($width, $height);
 
 			$thumb = imagecreatetruecolor($tsize[0], $tsize[1]);
@@ -176,16 +175,6 @@ class PixelFileHandler extends DataHandlerExtension {
 			return $thumb;
 		}
 	}
-
-	private function read_file(/*string*/ $fname) {
-		$fp = fopen($fname, "r");
-		if(!$fp) return false;
-
-		$data = fread($fp, filesize($fname));
-		fclose($fp);
-
-		return $data;
-	}
 // }}}
 }
 ?>
diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index aa83fa16..8c3a50dd 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -15,26 +15,26 @@ $(function() {
 	}
 });
 
-function zoom(zoom) {
+function zoom(zoom_type) {
 	var img = $('.shm-main-image');
-	if(zoom == "full") {
+	if(zoom_type == "full") {
 		img.css('max-width', img.data('width') + 'px');
 		img.css('max-height', img.data('height') + 'px');
 	}
-	if(zoom == "width") {
+	if(zoom_type == "width") {
 		img.css('max-width', '95%');
 		img.css('max-height', img.data('height') + 'px');
 	}
-	if(zoom == "height") {
+	if(zoom_type == "height") {
 		img.css('max-width', img.data('width') + 'px');
 		img.css('max-height', (window.innerHeight * 0.95) + 'px');
 	}
-	if(zoom == "both") {
+	if(zoom_type == "both") {
 		img.css('max-width', '95%');
 		img.css('max-height', (window.innerHeight * 0.95) + 'px');
 	}
 
-	$(".shm-zoomer").val(zoom);
+	$(".shm-zoomer").val(zoom_type);
 
-	$.cookie("ui-image-zoom", zoom, {path: '/', expires: 365});
+	$.cookie("ui-image-zoom", zoom_type, {path: '/', expires: 365});
 }
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index a0bc04e7..76b9a18d 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -10,7 +10,6 @@ class SVGFileHandler extends Extension {
 	public function onDataUpload(DataUploadEvent $event) {
 		if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
-			$ha = substr($hash, 0, 2);
 			if(!move_upload_to_archive($event)) return;
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
 			$image = $this->create_image_from_data(warehouse_path("images", $hash), $event->metadata);
@@ -27,7 +26,6 @@ class SVGFileHandler extends Extension {
 		global $config;
 		if($this->supported_ext($event->type)) {
 			$hash = $event->hash;
-			$ha = substr($hash, 0, 2);
 
 			copy("ext/handle_svg/thumb.jpg", warehouse_path("thumbs", $hash));
 		}
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index c58dd6e5..3e584ce3 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -31,6 +31,9 @@ else {
 			<source src='" . make_link("/image/" . $image->id) . "' type='video/webm' />
 			</video>";
 		}
+		else {
+			$html = "Video type '$ext' not recognised";
+		}
 		$page->add_block(new Block("Video", $html, "main", 10));
 	}
 }
diff --git a/ext/image/main.php b/ext/image/main.php
index 59369dd9..32d1bf97 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -20,7 +20,7 @@ class ImageAdditionEvent extends Event {
 	 * this new image.
 	 *
 	 * @sa TagSetEvent
-	 * @param $image	The new image to add.
+	 * @param $image Image	The new image to add.
 	 */
 	public function __construct(Image $image) {
 		$this->image = $image;
@@ -46,7 +46,7 @@ class ImageDeletionEvent extends Event {
 	 * Used by things like tags and comments handlers to
 	 * clean out related rows in their tables.
 	 *
-	 * @param $image 	The image being deleted
+	 * @param $image Image	The image being deleted
 	*/
 	public function __construct(Image $image) {
 		$this->image = $image;
@@ -93,8 +93,9 @@ class ThumbnailGenerationEvent extends Event {
 	/**
 	 * Request a thumbnail be made for an image object
 	 *
-	 * @param $hash	The unique hash of the image
-	 * @param $type	The type of the image
+	 * @param $hash	string The unique hash of the image
+	 * @param $type	string The type of the image
+	 * @param $force boolean Regenerate the thumbnail even if one already exists
 	 */
 	public function __construct($hash, $type, $force=false) {
 		$this->hash = $hash;
@@ -223,9 +224,6 @@ class ImageIO extends Extension {
 	}
 	
 	public function onUserPageBuilding(UserPageBuildingEvent $event) {
-		global $user;
-		global $config;
-	
 		$u_id = url_escape($event->display_user->id);
 		$i_image_count = Image::count_images(array("user_id={$event->display_user->id}"));
 		$i_days_old = ((time() - strtotime($event->display_user->join_date)) / 86400) + 1;
@@ -279,7 +277,7 @@ class ImageIO extends Extension {
 
 
 // add image {{{
-	private function add_image($image) {
+	private function add_image(Image $image) {
 		global $page, $user, $database, $config;
 
 		/*
@@ -401,11 +399,8 @@ class ImageIO extends Extension {
 
 // replace image {{{
 	private function replace_image($id, $image) {
-		global $page;
-		global $user;
 		global $database;
-		global $config;
-		
+
 		/* Check to make sure the image exists. */
 		$existing = Image::by_id($id);
 		
diff --git a/ext/image_hash_ban/theme.php b/ext/image_hash_ban/theme.php
index 5afd92b1..87c70cb1 100644
--- a/ext/image_hash_ban/theme.php
+++ b/ext/image_hash_ban/theme.php
@@ -22,7 +22,6 @@ class ImageBanTheme extends Themelet {
 	 */
 	public function display_image_hash_bans(Page $page, $page_number, $page_count, $bans) {
 		$h_bans = "";
-		$n = 0;
 		foreach($bans as $ban) {
 			$h_bans .= "
 				<tr>
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 0b7f5ee5..7c04910b 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -1,6 +1,8 @@
 <?php
 
 class IndexTheme extends Themelet {
+	var $page_number, $total_pages, $search_terms;
+
 	public function set_page($page_number, $total_pages, $search_terms) {
 		$this->page_number = $page_number;
 		$this->total_pages = $total_pages;
diff --git a/ext/ipban/theme.php b/ext/ipban/theme.php
index b6f46b16..e9e927b6 100644
--- a/ext/ipban/theme.php
+++ b/ext/ipban/theme.php
@@ -14,7 +14,6 @@ class IPBanTheme extends Themelet {
 	public function display_bans(Page $page, $bans) {
 		global $database, $user;
 		$h_bans = "";
-		$n = 0;
 		$prefix = ($database->get_driver_name() == "sqlite" ? "bans." : "");
 		$prefix2 = ($database->get_driver_name() == "sqlite" ? "users." : "");
 		foreach($bans as $ban) {
diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php
index 1e5d2196..24de94dc 100644
--- a/ext/link_image/theme.php
+++ b/ext/link_image/theme.php
@@ -62,7 +62,7 @@ class LinkImageTheme extends Themelet {
 				$text = "[url=".$url."]".$content."[/url]";
 				break;
 			default:
-				$text = $link." - ".$content;
+				$text = $url." - ".$content;
 		}
 		return $text;
 	}
diff --git a/ext/livefeed/main.php b/ext/livefeed/main.php
index 3ce78f83..804b57e6 100644
--- a/ext/livefeed/main.php
+++ b/ext/livefeed/main.php
@@ -63,6 +63,7 @@ class LiveFeed extends Extension {
 			fwrite($fp, "$data\n");
             fclose($fp);
         } catch (Exception $e) {
+            /* logging errors shouldn't break everything */
         }
     }
 }
diff --git a/ext/log_db/theme.php b/ext/log_db/theme.php
index a10dd838..77705826 100644
--- a/ext/log_db/theme.php
+++ b/ext/log_db/theme.php
@@ -40,7 +40,6 @@ class LogDatabaseTheme extends Themelet {
 		</form>
 	</thead>
 	<tbody>\n";
-		$n = 0;
 		reset($events); // rewind to first element in array.
 		
 		foreach($events as $event) {
diff --git a/ext/log_net/main.php b/ext/log_net/main.php
index 56ee4c9e..f82d01d3 100644
--- a/ext/log_net/main.php
+++ b/ext/log_net/main.php
@@ -42,6 +42,7 @@ class LogNet extends Extension {
 			fwrite($fp, "$data\n");
 			fclose($fp);
 		} catch (Exception $e) {
+			/* logging errors shouldn't break everything */
 		}
 	}
 }
diff --git a/ext/not_a_tag/main.php b/ext/not_a_tag/main.php
index 0aa72f19..5dcb41fc 100644
--- a/ext/not_a_tag/main.php
+++ b/ext/not_a_tag/main.php
@@ -29,7 +29,7 @@ class NotATag extends Extension {
 	}
 
 	private function scan(/*array*/ $tags_mixed) {
-		global $config, $database;
+		global $database;
 
 		$tags = array();
 		foreach($tags_mixed as $tag) $tags[] = strtolower($tag);
@@ -53,12 +53,12 @@ class NotATag extends Extension {
 	}
 
 	public function onPageRequest(PageRequestEvent $event) {
-		global $config, $database, $page, $user;
+		global $database, $page, $user;
 
 		if($event->page_matches("untag")) {
 			if($user->can("ban_image")) {
 				if($event->get_arg(0) == "add") {
-					$tag = isset($_POST["tag"]) ? $_POST["tag"] : $image->tag;
+					$tag = $_POST["tag"];
 					$redirect = isset($_POST['redirect']) ? $_POST['redirect'] : "DNP";
 
 					$database->Execute(
diff --git a/ext/not_a_tag/theme.php b/ext/not_a_tag/theme.php
index 993bd0dc..543af6f5 100644
--- a/ext/not_a_tag/theme.php
+++ b/ext/not_a_tag/theme.php
@@ -2,7 +2,6 @@
 class NotATagTheme extends Themelet {
 	public function display_untags(Page $page, $page_number, $page_count, $bans) {
 		$h_bans = "";
-		$n = 0;
 		foreach($bans as $ban) {
 			$h_bans .= "
 				<tr>
diff --git a/ext/notes/main.php b/ext/notes/main.php
index 4d020cfd..cfbb6259 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -363,6 +363,8 @@ class Notes extends Extension {
 	*/
 	private function delete_note()
 	{
+        global $user;
+
 		$imageID = int_escape($_POST["image_id"]);
 		$noteID = int_escape($_POST["note_id"]);
 
@@ -388,7 +390,7 @@ class Notes extends Extension {
 	* HERE WE DELETE ALL NOTES FROM IMAGE
 	*/
 	private function nuke_notes() {
-		global $database;
+		global $database, $user;
 		$image_id = int_escape($_POST["image_id"]);
 		$database->execute("DELETE FROM notes WHERE image_id = ?", array($image_id));
 		log_info("notes", "Notes deleted from {$image_id} by {$user->name}");
@@ -400,7 +402,7 @@ class Notes extends Extension {
 	* HERE WE DELETE ALL REQUESTS FOR IMAGE
 	*/
 	private function nuke_requests() {
-		global $database;
+		global $database, $user;
 		$image_id = int_escape($_POST["image_id"]);
 
 		$database->execute("DELETE FROM note_request WHERE image_id = ?", array($image_id));
@@ -588,7 +590,6 @@ class Notes extends Extension {
 		$noteEnable = $history['note_enable'];
 		$noteID = $history['note_id'];
 		$imageID = $history['image_id'];
-		$userID = $user->id;
 		$noteX1 = $history['x1'];
 		$noteY1 = $history['y1'];
 		$noteHeight = $history['height'];
diff --git a/ext/notes/theme.php b/ext/notes/theme.php
index c958c1e3..99359b92 100644
--- a/ext/notes/theme.php
+++ b/ext/notes/theme.php
@@ -1,6 +1,6 @@
 <?php
 class NotesTheme extends Themelet {
-    public function note_button($image_id) {
+	public function note_button($image_id) {
 		return '		
 			<!-- <a href="#" id="addnotelink" >Add a note</a> -->
 			<form action="" method="">
@@ -39,32 +39,32 @@ class NotesTheme extends Themelet {
 	
 		$page->set_title(html_escape("Search Note"));
 		$page->set_heading(html_escape("Search Note"));
-        $page->add_block(new Block("Search Note", $html, "main", 10));
+		$page->add_block(new Block("Search Note", $html, "main", 10));
 	}
 		
-		// check action POST on form	
+	// check action POST on form
 	public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions)
 	{
 		$to_json = array();
-        foreach($recovered_notes as $note)
-        {
-            $parsedNote = $note["note"];
-            $parsedNote = str_replace("\n", "\\n", $parsedNote);
-            $parsedNote = str_replace("\r", "\\r", $parsedNote);
+		foreach($recovered_notes as $note)
+		{
+			$parsedNote = $note["note"];
+			$parsedNote = str_replace("\n", "\\n", $parsedNote);
+			$parsedNote = str_replace("\r", "\\r", $parsedNote);
 
-            $to_json[] = array(
+			$to_json[] = array(
 				'x1' => $note["x1"],
-                'y1' => $note["y1"],
-                'height' => $note["height"],
-                'width' => $note["width"],
-                'note' => $parsedNote,
-                'note_id' => $note["id"],
+				'y1' => $note["y1"],
+				'height' => $note["height"],
+				'width' => $note["width"],
+				'note' => $parsedNote,
+				'note_id' => $note["id"],
 			);
-        }
+		}
 
 		$html = "<script type='text/javascript'>";
 		$html .= "notes = " . json_encode($to_json);
-        $html .= "</script>
+		$html .= "</script>
 	
 	<div id='noteform'>
 		".make_form(make_link("note/add_note"))."
@@ -88,41 +88,41 @@ class NotesTheme extends Themelet {
 			
 		</form>
 	</div>
-        <div id='noteEditForm'>
+		<div id='noteEditForm'>
 			".make_form(make_link("note/edit_note"))."
-                <input type='hidden' name='image_id' value='".$image_id."' />
-                <input type='hidden' name='note_id' id='EditNoteID' value='' />
-                <input name='note_x1' type='hidden' value='' id='EditNoteX1' />
-                <input name='note_y1' type='hidden' value='' id='EditNoteY1' />
-                <input name='note_height' type='hidden' value='' id='EditNoteHeight' />
-                <input name='note_width' type='hidden' value='' id='EditNoteWidth' />
-                <table>
-                    <tr>
-                        <td colspan='2'>
-                            <textarea name='note_text' id='EditNoteNote' ></textarea>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><input type='submit' value='Save Note' /></td>
-                        <td><input type='button' value='Cancel' id='EditCancelNote' /></td>
-                    </tr>
-                </table>
-            </form>";
+				<input type='hidden' name='image_id' value='".$image_id."' />
+				<input type='hidden' name='note_id' id='EditNoteID' value='' />
+				<input name='note_x1' type='hidden' value='' id='EditNoteX1' />
+				<input name='note_y1' type='hidden' value='' id='EditNoteY1' />
+				<input name='note_height' type='hidden' value='' id='EditNoteHeight' />
+				<input name='note_width' type='hidden' value='' id='EditNoteWidth' />
+				<table>
+					<tr>
+						<td colspan='2'>
+							<textarea name='note_text' id='EditNoteNote' ></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td><input type='submit' value='Save Note' /></td>
+						<td><input type='button' value='Cancel' id='EditCancelNote' /></td>
+					</tr>
+				</table>
+			</form>";
 
-        if($adminOptions)
-            $html .= "
+		if($adminOptions)
+			$html .= "
 				".make_form(make_link("note/delete_note"))."
-                <input type='hidden' name='image_id' value='".$image_id."' />
-                <input type='hidden' name='note_id' value='' id='DeleteNoteNoteID' />
-                <table>
-                    <tr>
-                        <td><input type='submit' value='Delete note' /></td>
-                    </tr>
-                </table>
-            </form>
+				<input type='hidden' name='image_id' value='".$image_id."' />
+				<input type='hidden' name='note_id' value='' id='DeleteNoteNoteID' />
+				<table>
+					<tr>
+						<td><input type='submit' value='Delete note' /></td>
+					</tr>
+				</table>
+			</form>
 ";
 
-        $html .= "</div>";
+		$html .= "</div>";
 
 		$page->add_block(new Block(null, $html, "main", 1));
 	}
@@ -169,101 +169,71 @@ class NotesTheme extends Themelet {
 		$page->set_heading("Note Requests");
 		$page->add_block(new Block("Note Requests", $pool_images, "main", 20));
 	}
-	
-	public function display_histories($histories, $pageNumber, $totalPages) {
-		global $user, $page;
-		
+
+	private function get_history($histories) {
+		global $user;
+
 		$html = "<table id='poolsList' class='zebra'>".
-				"<thead><tr>".
-            	"<th>Image</th>".
-				"<th>Note</th>".
-				"<th>Body</th>".
-				"<th>Updater</th>".
-            	"<th>Date</th>";
-				
-		
+			"<thead><tr>".
+			"<th>Image</th>".
+			"<th>Note</th>".
+			"<th>Body</th>".
+			"<th>Updater</th>".
+			"<th>Date</th>";
+
 		if(!$user->is_anonymous()){
 			$html .= "<th>Action</th>";
 		}
-		
+
 		$html .= "</tr></thead>".
-				 "<tbody>";
-		
-		$n = 0;		
+			"<tbody>";
+
 		foreach($histories as $history) {
 			$image_link = "<a href='".make_link("post/view/".$history['image_id'])."'>".$history['image_id']."</a>";
 			$history_link = "<a href='".make_link("note/history/".$history['note_id'])."'>".$history['note_id'].".".$history['review_id']."</a>";
 			$user_link = "<a href='".make_link("user/".$history['user_name'])."'>".$history['user_name']."</a>";
 			$revert_link = "<a href='".make_link("note/revert/".$history['note_id']."/".$history['review_id'])."'>Revert</a>";
-		
+
 			$html .= "<tr>".
-                	 "<td>".$image_link."</td>".
-					 "<td>".$history_link."</td>".
-					 "<td style='text-align:left;'>".$history['note']."</td>".
-                	 "<td>".$user_link."</td>".
-					 "<td>".autodate($history['date'])."</td>";
-					 
+				"<td>".$image_link."</td>".
+				"<td>".$history_link."</td>".
+				"<td style='text-align:left;'>".$history['note']."</td>".
+				"<td>".$user_link."</td>".
+				"<td>".autodate($history['date'])."</td>";
+
 			if(!$user->is_anonymous()){
 				$html .= "<td>".$revert_link."</td>";
 			}
-                	 
+
 		}
-		
+
 		$html .= "</tr></tbody></table>";
-					
+
+		return $html;
+	}
+
+	public function display_histories($histories, $pageNumber, $totalPages) {
+		global $page;
+
+		$html = $this->get_history($histories);
+
 		$page->set_title("Note Updates");
 		$page->set_heading("Note Updates");
 		$page->add_block(new Block("Note Updates", $html, "main", 10));
-		
+
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
 	
 	public function display_history($histories, $pageNumber, $totalPages) {
-		global $user, $page;
-		
-		$html = "<table id='poolsList' class='zebra'>".
-				"<thead><tr>".
-            	"<th>Image</th>".
-				"<th>Note</th>".
-				"<th>Body</th>".
-				"<th>Updater</th>".
-            	"<th>Date</th>";
-				
-		
-		if(!$user->is_anonymous()){
-			$html .= "<th>Action</th>";
-		}
-		
-		$html .= "</tr></thead>".
-				 "<tbody>";
-		
-		$n = 0;		
-		foreach($histories as $history) {
-			$image_link = "<a href='".make_link("post/view/".$history['image_id'])."'>".$history['image_id']."</a>";
-			$history_link = "<a href='".make_link("note/history/".$history['note_id'])."'>".$history['note_id'].".".$history['review_id']."</a>";
-			$user_link = "<a href='".make_link("user/".$history['user_name'])."'>".$history['user_name']."</a>";
-			$revert_link = "<a href='".make_link("note/revert/".$history['note_id']."/".$history['review_id'])."'>Revert</a>";
-		
-			$html .= "<tr>".
-                	 "<td>".$image_link."</td>".
-					 "<td>".$history_link."</td>".
-					 "<td style='text-align:left;'>".$history['note']."</td>".
-                	 "<td>".$user_link."</td>".
-					 "<td>".autodate($history['date'])."</td>";
-					 
-			if(!$user->is_anonymous()){
-				$html .= "<td>".$revert_link."</td>";
-			}
-                	 
-		}
-		
-		$html .= "</tr></tbody></table>";
-					
+		global $page;
+
+		$html = $this->get_history($histories);
+
 		$page->set_title("Note History");
 		$page->set_heading("Note History");
 		$page->add_block(new Block("Note History", $html, "main", 10));
 		
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
-}        
+}		
 ?>
diff --git a/ext/oekaki/main.php b/ext/oekaki/main.php
index 42d06e10..6c114537 100644
--- a/ext/oekaki/main.php
+++ b/ext/oekaki/main.php
@@ -28,6 +28,7 @@ class Oekaki extends Extension {
 							throw new UploadException("File has no extension");
 						}
 						log_info("oekaki", "Processing file [{$pathinfo['filename']}]");
+						$metadata = array();
 						$metadata['filename'] = 'oekaki.png';
 						$metadata['extension'] = $pathinfo['extension'];
 						$metadata['tags'] = 'oekaki tagme';
diff --git a/ext/oekaki/theme.php b/ext/oekaki/theme.php
index fccad46a..468c0bdb 100644
--- a/ext/oekaki/theme.php
+++ b/ext/oekaki/theme.php
@@ -9,7 +9,6 @@ class OekakiTheme extends Themelet {
 		global $config, $page;
 
 		$base_href = get_base_href();
-		$http_base = make_http($base_href);
 
 		$oekW = $config->get_int("oekaki_width", 400);
 		$oekH = $config->get_int("oekaki_height", 400);
diff --git a/ext/pm/theme.php b/ext/pm/theme.php
index bf30302b..7b0f5be1 100644
--- a/ext/pm/theme.php
+++ b/ext/pm/theme.php
@@ -8,7 +8,6 @@ class PrivMsgTheme extends Themelet {
 			<table id='pms' class='zebra sortable'>
 				<thead><tr><th>R?</th><th>Subject</th><th>From</th><th>Date</th><th>Action</th></tr></thead>
 				<tbody>";
-		$n = 0;
 		foreach($pms as $pm) {
 			$h_subject = html_escape($pm->subject);
 			if(strlen(trim($h_subject)) == 0) $h_subject = "(No subject)";
diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index b31be49e..fd25d431 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -12,7 +12,6 @@ class PoolsTheme extends Themelet {
 	}
 
 	public function get_adder_html(Image $image, /*array*/ $pools) {
-		$editor = "";
 		$h = "";
 		foreach($pools as $pool) {
 			$h .= "<option value='".$pool['id']."'>".html_escape($pool['title'])."</option>";
@@ -43,8 +42,6 @@ class PoolsTheme extends Themelet {
 						<th>Public</th>
 					</tr></thead><tbody>';
 
-		$n = 0;
-		
 		// Build up the list of pools.
 		foreach($pools as $pool) {
 			$pool_link = '<a href="'.make_link("pool/view/".$pool['id']).'">'.html_escape($pool['title'])."</a>";
@@ -133,7 +130,6 @@ class PoolsTheme extends Themelet {
 								<th class="left">Description</th>
 							</tr></thead><tbody>';
 
-			$n = 0;
 			foreach($pools as $pool) {
 				$pool_info .= "<tr>".
 					"<td class='left'>".html_escape($pool['title'])."</td>".
@@ -303,15 +299,15 @@ class PoolsTheme extends Themelet {
 		$this->display_top($pools, "Sorting Pool");
 
 		$pool_images = "\n<form action='".make_link("pool/order")."' method='POST' name='checks'>";
-		$n = 0;
+		$i = 0;
 		foreach($images as $pair) {
 			$image = $pair[0];
 			$thumb_html = $this->build_thumb_html($image);
 			$pool_images .= '<span class="thumb">'."\n".$thumb_html."\n".
-				'<br><input name="imgs['.$n.'][]" type="text" style="max-width:50px;" value="'.$image->image_order.'" />'.
-				'<input name="imgs['.$n.'][]" type="hidden" value="'.$image->id.'" />'.
+				'<br><input name="imgs['.$i.'][]" type="text" style="max-width:50px;" value="'.$image->image_order.'" />'.
+				'<input name="imgs['.$i.'][]" type="hidden" value="'.$image->id.'" />'.
 				'</span>';
-			$n++;
+			$i++;
 		}
 
 		$pool_images .= "<br>".
@@ -382,7 +378,6 @@ class PoolsTheme extends Themelet {
 					<th>Action</th>
 				</tr></thead><tbody>';
 
-		$n = 0;
 		foreach($histories as $history) {
 			$pool_link = "<a href='".make_link("pool/view/".$history['pool_id'])."'>".html_escape($history['title'])."</a>";
 			$user_link = "<a href='".make_link("user/".url_escape($history['user_name']))."'>".html_escape($history['user_name'])."</a>";
diff --git a/ext/rating/theme.php b/ext/rating/theme.php
index bc95ea70..3e9437a6 100644
--- a/ext/rating/theme.php
+++ b/ext/rating/theme.php
@@ -2,7 +2,6 @@
 
 class RatingsTheme extends Themelet {
 	public function get_rater_html(/*int*/ $image_id, /*string*/ $rating) {
-		$i_image_id = int_escape($image_id);
 		$s_checked = $rating == 's' ? " checked" : "";
 		$q_checked = $rating == 'q' ? " checked" : "";
 		$e_checked = $rating == 'e' ? " checked" : "";
diff --git a/ext/report_image/theme.php b/ext/report_image/theme.php
index 4e3afb9c..b62fd02a 100644
--- a/ext/report_image/theme.php
+++ b/ext/report_image/theme.php
@@ -15,7 +15,6 @@ class ReportImageTheme extends Themelet {
 		global $config;
 
 		$h_reportedimages = "";
-		$n = 0;
 		foreach($reports as $report) {
 			$image = $report['image'];
 			$h_reason = format_text($report['reason']);
diff --git a/ext/resize/theme.php b/ext/resize/theme.php
index 2dfa11c2..e19a8e32 100644
--- a/ext/resize/theme.php
+++ b/ext/resize/theme.php
@@ -7,7 +7,6 @@ class ResizeImageTheme extends Themelet {
 	public function get_resize_html(Image $image) {
 		global $user, $config;
 
-		$i_image_id = int_escape($image->id);
 		$default_width = $config->get_int('resize_default_width');
 		$default_height = $config->get_int('resize_default_height');
 
diff --git a/ext/rotate/theme.php b/ext/rotate/theme.php
index d29bb172..ddef58c7 100644
--- a/ext/rotate/theme.php
+++ b/ext/rotate/theme.php
@@ -7,8 +7,6 @@ class RotateImageTheme extends Themelet {
 	public function get_rotate_html(/*int*/ $image_id) {
 		global $user, $config;
 
-		$i_image_id = int_escape($image_id);
-		
 		$html = "
 			".make_form(make_link('rotate/'.$image_id), 'POST')."
 				<input type='hidden' name='image_id' value='$image_id'>
diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index 6d67d1de..3bad7007 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -23,7 +23,6 @@ class SetupTheme extends Themelet {
 		 */
 		$setupblock_html = "";
 		foreach($panel->blocks as $block) {
-			$html = $this->sb_to_html($block);
 			$setupblock_html .= $this->sb_to_html($block);
 		}
 
@@ -44,12 +43,10 @@ class SetupTheme extends Themelet {
 		global $user;
 
 		$h_rows = "";
-		$n = 0;
 		ksort($options);
 		foreach($options as $name => $value) {
 			$h_name = html_escape($name);
 			$h_value = html_escape($value);
-			$len = strlen($h_value);
 
 			$h_box = "";
 			if(strpos($value, "\n") > 0) {
diff --git a/ext/sitemap/main.php b/ext/sitemap/main.php
index 33e7e566..3044ffe7 100644
--- a/ext/sitemap/main.php
+++ b/ext/sitemap/main.php
@@ -63,7 +63,7 @@ class XMLSitemap extends Extension {
         {
                 global $database, $config;
                 // add index
-                $index[0] = $base_href = $config->get_string("front_page");
+                $index[0] = $config->get_string("front_page");
                 $this->add_sitemap_queue($index, "weekly", "1");
 
                 /* --- Add 20 most used tags --- */
@@ -162,4 +162,4 @@ class XMLSitemap extends Extension {
             $page->set_data($xml);
         }
 }
-?>
\ No newline at end of file
+?>
diff --git a/ext/source_history/main.php b/ext/source_history/main.php
index 3137a265..366ea7cf 100644
--- a/ext/source_history/main.php
+++ b/ext/source_history/main.php
@@ -351,7 +351,7 @@ class Source_History extends Extension {
 		}
 
 		// add a history entry	
-		$row = $database->execute("
+		$database->execute("
 				INSERT INTO source_histories(image_id, source, user_id, user_ip, date_set)
 				VALUES (?, ?, ?, ?, now())",
 				array($image->id, $new_source, $user->id, $_SERVER['REMOTE_ADDR']));
diff --git a/ext/tagger/main.php b/ext/tagger/main.php
index 6165b810..4df81ee8 100644
--- a/ext/tagger/main.php
+++ b/ext/tagger/main.php
@@ -80,7 +80,6 @@ class TaggerXML extends Extension {
 		$q_where = "WHERE {$match} {$hidden} AND count > 0";
 
 		// FROM based on return count
-		$q_from = null;
 		$count = $this->count($q_where,$values);
 		if ($count > $max_rows) {
 			$q_from = "FROM (SELECT * FROM `tags` {$q_where} ".
@@ -139,25 +138,5 @@ class TaggerXML extends Extension {
 		return $database->Execute(
 			"SELECT COUNT(*) FROM `tags` $query",$values)->fields['COUNT(*)'];
 	}
-
-	private function image_tags ($image_id) {
-		global $database;
-		$list = "(";
-		$i_tags = $database->Execute(
-			"SELECT tag_id FROM `image_tags` WHERE image_id=?",
-			array($image_id));
-
-		$b = false;
-		foreach($i_tags as $tag) {
-			if($b)
-				$list .= ",";
-			$b = true;
-			$list .= $tag['tag_id'];
-
-		}
-		$list .= ")";
-
-		return $list;
-	}
 } 
 ?>
diff --git a/ext/tips/theme.php b/ext/tips/theme.php
index 3c86b53e..2f4b84ba 100644
--- a/ext/tips/theme.php
+++ b/ext/tips/theme.php
@@ -65,7 +65,6 @@ class TipsTheme extends Themelet {
 
 		$html .= "</tr></thead>";
 
-		$n = 0;
 		foreach ($tips as $tip) {
 			$tip_enable = ($tip['enable'] == "Y") ? "Yes" : "No";
 			$set_link = "<a href='".make_link("tips/status/".$tip['id'])."'>".$tip_enable."</a>";
diff --git a/ext/wiki/theme.php b/ext/wiki/theme.php
index 45b7bee4..54e7338d 100644
--- a/ext/wiki/theme.php
+++ b/ext/wiki/theme.php
@@ -39,7 +39,6 @@ class WikiTheme extends Themelet {
 
 	protected function create_edit_html(WikiPage $page) {
 		$h_title = html_escape($page->title);
-		$u_title = url_escape($page->title);
 		$i_revision = int_escape($page->revision) + 1;
 
 		global $user;
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index a6c5be6a..b69c5288 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -21,7 +21,6 @@ class Themelet extends BaseThemelet {
 	private function build_paginator($current_page, $total_pages, $base_url, $query) {
 		$next = $current_page + 1;
 		$prev = $current_page - 1;
-		$rand = mt_rand(1, $total_pages);
 
 		$at_start = ($current_page <= 3 || $total_pages <= 3);
 		$at_end = ($current_page >= $total_pages -2);
diff --git a/themes/danbooru/user.theme.php b/themes/danbooru/user.theme.php
index ca62caa8..fba58e8d 100644
--- a/themes/danbooru/user.theme.php
+++ b/themes/danbooru/user.theme.php
@@ -35,7 +35,6 @@ class CustomUserPageTheme extends UserPageTheme {
 	}
 
 	public function display_user_block(Page $page, User $user, $parts) {
-		$h_name = html_escape($user->name);
 		$html = "";
 		$blocked = array("Pools", "Pool Changes", "Alias Editor", "My Profile");
 		foreach($parts as $part) {
diff --git a/themes/danbooru2/themelet.class.php b/themes/danbooru2/themelet.class.php
index a6c5be6a..b69c5288 100644
--- a/themes/danbooru2/themelet.class.php
+++ b/themes/danbooru2/themelet.class.php
@@ -21,7 +21,6 @@ class Themelet extends BaseThemelet {
 	private function build_paginator($current_page, $total_pages, $base_url, $query) {
 		$next = $current_page + 1;
 		$prev = $current_page - 1;
-		$rand = mt_rand(1, $total_pages);
 
 		$at_start = ($current_page <= 3 || $total_pages <= 3);
 		$at_end = ($current_page >= $total_pages -2);
diff --git a/themes/danbooru2/user.theme.php b/themes/danbooru2/user.theme.php
index ca62caa8..fba58e8d 100644
--- a/themes/danbooru2/user.theme.php
+++ b/themes/danbooru2/user.theme.php
@@ -35,7 +35,6 @@ class CustomUserPageTheme extends UserPageTheme {
 	}
 
 	public function display_user_block(Page $page, User $user, $parts) {
-		$h_name = html_escape($user->name);
 		$html = "";
 		$blocked = array("Pools", "Pool Changes", "Alias Editor", "My Profile");
 		foreach($parts as $part) {