diff --git a/contrib/notes/theme.php b/contrib/notes/theme.php
index 0da3a29e..bba37b28 100644
--- a/contrib/notes/theme.php
+++ b/contrib/notes/theme.php
@@ -57,12 +57,12 @@ class NotesTheme extends Themelet {
             $parsedNote = str_replace("\r", "\\r", $parsedNote);
 
             $to_json[] = array(
-				'x1': $note["x1"],
-                'y1': $note["y1"],
-                'height': $note["height"],
-                'width': $note["width"],
-                'note': $parsedNote,
-                'note_id': $note["id"],
+				'x1' => $note["x1"],
+                'y1' => $note["y1"],
+                'height' => $note["height"],
+                'width' => $note["width"],
+                'note' => $parsedNote,
+                'note_id' => $note["id"],
 			);
         }
 
diff --git a/core/user.class.php b/core/user.class.php
index 0c69eabd..c36f96a9 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -232,7 +232,7 @@ class User {
 			if(!empty($this->email)) {
 				$hash = md5(strtolower($this->email));
 				$s = $config->get_string("avatar_gravatar_size");
-				$d = $config->get_string("avatar_gravatar_default");
+				$d = urlencode($config->get_string("avatar_gravatar_default"));
 				$r = $config->get_string("avatar_gravatar_rating");
 				return "<img class=\"avatar gravatar\" src=\"http://www.gravatar.com/avatar/$hash.jpg?s=$s&d=$d&r=$r\">";
 			}
diff --git a/ext/comment/main.php b/ext/comment/main.php
index 2ebed4c3..d1b121b8 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -471,7 +471,7 @@ class CommentList extends Extension {
 			throw new CommentPostingException("Comment too repetitive~");
 		}
 		else if($user->is_anonymous() && !$this->hash_match()) {
-			set_prefixed_cookie("nocache", "Anonymous Commenter", time()+60*60*24*$config->get_int('login_memory'), "/");
+			set_prefixed_cookie("nocache", "Anonymous Commenter", time()+60*60*24, "/");
 			throw new CommentPostingException(
 					"Comment submission form is out of date; refresh the ".
 					"comment form to show you aren't a spammer~");
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 42f1bf87..82dfcb46 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -40,7 +40,7 @@ class TagEditTheme extends Themelet {
 		$ip = $user->can("view_ip") ? " (".show_ip($image->owner_ip, "Image posted {$image->posted}").")" : "";
 		return "
 			<tr>
-				<td>User</td>
+				<td>Uploader</td>
 				<td>
 					<span class='view'><a class='username' href='".make_link("user/$h_owner")."'>$h_owner</a>$ip, $h_date</span>
 					<input class='edit' type='text' name='tag_edit__owner' value='$h_owner'>
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 4cd80d2a..668e9289 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -72,7 +72,10 @@ class ViewImageTheme extends Themelet {
 		foreach($editor_parts as $part) {
 			$html .= $part;
 		}
-		if(!$image->is_locked() || $user->can("lock_image")) {
+		if(
+			(!$image->is_locked() || $user->can("lock_image")) &&
+			$user->can("edit_image_tag")
+		) {
 			$html .= "
 						<tr><td colspan='4'>
 							<input class='view' type='button' value='Edit' onclick='$(\".view\").hide(); $(\".edit\").show();'>
diff --git a/install.php b/install.php
index 139bc4c5..01938651 100755
--- a/install.php
+++ b/install.php
@@ -44,6 +44,20 @@
 assert_options(ASSERT_ACTIVE, 1);
 assert_options(ASSERT_BAIL, 1);
 
+/*
+ * Compute the path to the folder containing "install.php" and 
+ * store it as the 'Shimmie Root' folder for later on.
+ *
+ * Example:
+ *	__SHIMMIE_ROOT__ = '/var/www/shimmie2/'
+ *
+ */
+define('__SHIMMIE_ROOT__', trim( remove_trailing_slash( dirname(__FILE__) ) ) . '/' ); 
+
+// Pull in necessary files
+require_once __SHIMMIE_ROOT__."core/util.inc.php";
+require_once __SHIMMIE_ROOT__."core/database.class.php";
+
 /*
  * This file lets anyone destroy the database -- disable it
  * as soon as the admin is done installing for the first time
@@ -54,23 +68,10 @@ if(is_readable("config.php")) {
 		<div id="iblock">
 			<h1>Shimmie Repair Console</h1>
 <?php
-
-	/*
-	 * Compute the path to the folder containing "install.php" and 
-	 * store it as the 'Shimmie Root' folder for later on.
-	 *
-	 * Example:
-	 *	__SHIMMIE_ROOT__ = '/var/www/shimmie2/'
-	 *
-	 */
-	define('__SHIMMIE_ROOT__', trim( remove_trailing_slash( dirname(__FILE__) ) ) . '/' ); 
-
-	// Pull in necessary files
+	// Load the config
 	require_once __SHIMMIE_ROOT__."config.php";			// Load user/site specifics First
 	require_once __SHIMMIE_ROOT__."core/default_config.inc.php";	// Defaults for the rest.
-	require_once __SHIMMIE_ROOT__."core/util.inc.php";
-	require_once __SHIMMIE_ROOT__."core/database.class.php";
-	
+
 	if (
 	      ( array_key_exists('dsn', $_SESSION) && $_SESSION['dsn'] === DATABASE_DSN ) ||
 	      ( array_key_exists('dsn', $_POST)    && $_POST['dsn']    === DATABASE_DSN )