diff --git a/contrib/artists/main.php b/contrib/artists/main.php
index 93a8a27e..f035224a 100644
--- a/contrib/artists/main.php
+++ b/contrib/artists/main.php
@@ -434,7 +434,7 @@ class Artists implements Extension {
     {
         global $database;
 
-        $result = $database->db->GetOne("SELECT COUNT(1) FROM artist_urls WHERE url = ?", array(mysql_real_escape_string($url)));
+        $result = $database->get_one("SELECT COUNT(1) FROM artist_urls WHERE url = ?", array(mysql_real_escape_string($url)));
         return ($result != 0);
     }
 
@@ -442,7 +442,7 @@ class Artists implements Extension {
     {
         global $database;
 
-        $result = $database->db->GetOne("SELECT COUNT(1) FROM artist_members WHERE name = ?", array(mysql_real_escape_string($member)));
+        $result = $database->get_one("SELECT COUNT(1) FROM artist_members WHERE name = ?", array(mysql_real_escape_string($member)));
         return ($result != 0);
     }
 
@@ -450,7 +450,7 @@ class Artists implements Extension {
     {
         global $database;
 
-        $result = $database->db->GetOne("SELECT COUNT(1) FROM artist_alias WHERE alias = ?", array(mysql_real_escape_string($alias)));
+        $result = $database->get_one("SELECT COUNT(1) FROM artist_alias WHERE alias = ?", array(mysql_real_escape_string($alias)));
         return ($result != 0);
     }
 
@@ -459,7 +459,7 @@ class Artists implements Extension {
 
         global $database;
 
-        $result = $database->db->GetOne("SELECT COUNT(1) FROM artist_alias WHERE artist_id = ? AND alias = ?", array(
+        $result = $database->get_one("SELECT COUNT(1) FROM artist_alias WHERE artist_id = ? AND alias = ?", array(
                 $artistID
                 , mysql_real_escape_string($alias)
             ));
@@ -870,7 +870,7 @@ class Artists implements Extension {
     private function artist_exists($name){
         global $database;
 
-        $result = $database->db->GetOne("SELECT COUNT(1) FROM artists WHERE name = ?"
+        $result = $database->get_one("SELECT COUNT(1) FROM artists WHERE name = ?"
             , array(
                 mysql_real_escape_string($name)
             ));
@@ -1046,7 +1046,7 @@ class Artists implements Extension {
                 $listing[$i]["artist_name"] = stripslashes($listing[$i]["artist_name"]);
             }
 
-            $count = $database->db->GetOne(
+            $count = $database->get_one(
                 "SELECT COUNT(1)
                 FROM artists AS a
                     LEFT OUTER JOIN artist_members AS am
@@ -1170,7 +1170,7 @@ class Artists implements Extension {
 
             global $database;
 
-            $result = $database->db->GetOne("SELECT COUNT(1) FROM artist_members WHERE artist_id = ? AND name = ?"
+            $result = $database->get_one("SELECT COUNT(1) FROM artist_members WHERE artist_id = ? AND name = ?"
                 , array(
                     $artistID
                     , mysql_real_escape_string($member)
@@ -1184,7 +1184,7 @@ class Artists implements Extension {
 
             global $database;
 
-            $result = $database->db->GetOne("SELECT COUNT(1) FROM artist_urls WHERE artist_id = ? AND url = ?"
+            $result = $database->get_one("SELECT COUNT(1) FROM artist_urls WHERE artist_id = ? AND url = ?"
                 , array(
                     $artistID
                     , mysql_real_escape_string($url)
diff --git a/contrib/et/main.php b/contrib/et/main.php
index 00dfd2ae..8b4c0099 100644
--- a/contrib/et/main.php
+++ b/contrib/et/main.php
@@ -50,14 +50,14 @@ class ET implements Extension {
 		$info['sys_server']  = $_SERVER["SERVER_SOFTWARE"];
 		include "config.php"; // more magical hax
 		$proto = preg_replace("#(.*)://.*#", "$1", $database_dsn);
-		$db = $database->db->ServerInfo();
-		$info['sys_db'] = "$proto / {$db['version']}";
+		#$db = $database->db->ServerInfo();
+		#$info['sys_db'] = "$proto / {$db['version']}";
 
-		$info['stat_images']   = $database->db->GetOne("SELECT COUNT(*) FROM images");
-		$info['stat_comments'] = $database->db->GetOne("SELECT COUNT(*) FROM comments");
-		$info['stat_users']    = $database->db->GetOne("SELECT COUNT(*) FROM users");
-		$info['stat_tags']     = $database->db->GetOne("SELECT COUNT(*) FROM tags");
-		$info['stat_image_tags'] = $database->db->GetOne("SELECT COUNT(*) FROM image_tags");
+		$info['stat_images']   = $database->get_one("SELECT COUNT(*) FROM images");
+		$info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments");
+		$info['stat_users']    = $database->get_one("SELECT COUNT(*) FROM users");
+		$info['stat_tags']     = $database->get_one("SELECT COUNT(*) FROM tags");
+		$info['stat_image_tags'] = $database->get_one("SELECT COUNT(*) FROM image_tags");
 
 		$els = array();
 		foreach($_event_listeners as $el) {
diff --git a/contrib/et/theme.php b/contrib/et/theme.php
index 3ddd5786..802cabbf 100644
--- a/contrib/et/theme.php
+++ b/contrib/et/theme.php
@@ -14,6 +14,8 @@ class ETTheme extends Themelet {
 	}
 
 	protected function build_data_form($info) {
+		global $user;
+
 		$data = <<<EOD
 Optional:
 Site title: {$info['site_title']}
@@ -27,7 +29,6 @@ Schema: {$info['sys_schema']}
 PHP: {$info['sys_php']}
 OS: {$info['sys_os']}
 Server: {$info['sys_server']}
-Database: {$info['sys_db']}
 Disk use: {$info['sys_disk']}
 
 Shimmie stats:
diff --git a/contrib/favorites/main.php b/contrib/favorites/main.php
index 4a8f5351..e28c355b 100644
--- a/contrib/favorites/main.php
+++ b/contrib/favorites/main.php
@@ -40,7 +40,7 @@ class Favorites extends SimpleExtension {
 			$user_id = $user->id;
 			$image_id = $event->image->id;
 
-			$is_favorited = $database->db->GetOne(
+			$is_favorited = $database->get_one(
 				"SELECT COUNT(*) AS ct FROM user_favorites WHERE user_id = ? AND image_id = ?",
 				array($user_id, $image_id)) > 0;
 		
diff --git a/contrib/forum/main.php b/contrib/forum/main.php
index c46fa006..7a0caed0 100644
--- a/contrib/forum/main.php
+++ b/contrib/forum/main.php
@@ -60,8 +60,8 @@ class Forum extends SimpleExtension {
 	public function onUserPageBuilding($event) {
 		global $page, $user, $database;
 		
-		$threads_count = $database->db->GetOne("SELECT COUNT(*) FROM forum_threads WHERE user_id=?", array($event->display_user->id));
-        $posts_count = $database->db->GetOne("SELECT COUNT(*) FROM forum_posts WHERE user_id=?", array($event->display_user->id));
+		$threads_count = $database->get_one("SELECT COUNT(*) FROM forum_threads WHERE user_id=?", array($event->display_user->id));
+        $posts_count = $database->get_one("SELECT COUNT(*) FROM forum_posts WHERE user_id=?", array($event->display_user->id));
 			
         $days_old = ((time() - strtotime($event->display_user->join_date)) / 86400) + 1;
 				
@@ -278,7 +278,7 @@ class Forum extends SimpleExtension {
                 , array($pageNumber * $threadsPerPage, $threadsPerPage)
             );
 			
-            $totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM forum_threads") / $threadsPerPage);
+            $totalPages = ceil($database->get_one("SELECT COUNT(*) FROM forum_threads") / $threadsPerPage);
 			
             $this->theme->display_thread_list($page, $threads, $showAdminOptions, $pageNumber + 1, $totalPages);
         }
@@ -309,7 +309,7 @@ class Forum extends SimpleExtension {
                 , array($threadID, $pageNumber * $postsPerPage, $postsPerPage)
             );
 			
-            $totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM forum_posts WHERE thread_id = ?", array($threadID)) / $postsPerPage);
+            $totalPages = ceil($database->get_one("SELECT COUNT(*) FROM forum_posts WHERE thread_id = ?", array($threadID)) / $postsPerPage);
 			
 			$threadTitle = $this->get_thread_title($threadID);
 			
diff --git a/contrib/image_hash_ban/main.php b/contrib/image_hash_ban/main.php
index b973eb32..354cd4dc 100644
--- a/contrib/image_hash_ban/main.php
+++ b/contrib/image_hash_ban/main.php
@@ -45,7 +45,7 @@ class ImageBan extends SimpleExtension {
 
 	public function onDataUpload(DataUploadEvent $event) {
 		global $database;
-		$row = $database->db->GetRow("SELECT * FROM image_bans WHERE hash = ?", $event->hash);
+		$row = $database->get_row("SELECT * FROM image_bans WHERE hash = :hash", array("hash"=>$event->hash));
 		if($row) {
 			log_info("image_hash_ban", "Blocked image ({$event->hash})");
 			throw new UploadException("Image ".html_escape($row["hash"])." has been banned, reason: ".format_text($row["reason"]));
@@ -87,7 +87,7 @@ class ImageBan extends SimpleExtension {
 						$page_num = int_escape($event->get_arg(1));
 					}
 					$page_size = 100;
-					$page_count = ceil($database->db->getone("SELECT COUNT(id) FROM image_bans")/$page_size);
+					$page_count = ceil($database->get_one("SELECT COUNT(id) FROM image_bans")/$page_size);
 					$this->theme->display_Image_hash_Bans($page, $page_num, $page_count, $this->get_image_hash_bans($page_num, $page_size));
 				}
 			}
diff --git a/contrib/log_db/main.php b/contrib/log_db/main.php
index 6e4caf73..b77a20d4 100644
--- a/contrib/log_db/main.php
+++ b/contrib/log_db/main.php
@@ -49,38 +49,34 @@ class LogDatabase extends SimpleExtension {
 				$page_num = int_escape($event->get_arg(0));
 				if($page_num <= 0) $page_num = 1;
 				if(!empty($_GET["time"])) {
-					$wheres[] = "date_sent LIKE ?";
-					$args[] = $_GET["time"]."%";
+					$wheres[] = "date_sent LIKE :time";
+					$args["time"] = $_GET["time"]."%";
 				}
 				if(!empty($_GET["module"])) {
-					$wheres[] = "section = ?";
-					$args[] = $_GET["module"];
+					$wheres[] = "section = :module";
+					$args["module"] = $_GET["module"];
 				}
 				if(!empty($_GET["user"])) {
 					if($database->engine->name == "pgsql") {
 						if(preg_match("#\d+\.\d+\.\d+\.\d+(/\d+)?#", $_GET["user"])) {
-							$wheres[] = "(username = ? OR address << ?)";
-							$args[] = $_GET["user"];
-							$args[] = $_GET["user"];
+							$wheres[] = "(username = :user OR address << :user)";
 						}
 						else {
-							$wheres[] = "lower(username) = lower(?)";
-							$args[] = $_GET["user"];
+							$wheres[] = "lower(username) = lower(:user)";
 						}
 					}
 					else {
-						$wheres[] = "(username = ? OR address = ?)";
-						$args[] = $_GET["user"];
-						$args[] = $_GET["user"];
+						$wheres[] = "(username = :user OR address = :user)";
 					}
+					$args["user"] = $_GET["user"];
 				}
 				if(!empty($_GET["priority"])) {
-					$wheres[] = "priority >= ?";
-					$args[] = int_escape($_GET["priority"]);
+					$wheres[] = "priority >= :priority";
+					$args["priority"] = int_escape($_GET["priority"]);
 				}
 				else {
-					$wheres[] = "priority >= ?";
-					$args[] = 20;
+					$wheres[] = "priority >= :priority";
+					$args["priority"] = 20;
 				}
 				$where = "";
 				if(count($wheres) > 0) {
@@ -92,16 +88,16 @@ class LogDatabase extends SimpleExtension {
 				$offset = ($page_num-1) * $limit;
 				$page_total = $database->cache->get("event_log_length");
 				if(!$page_total) {
-					$page_total = $database->db->GetOne("SELECT count(*) FROM score_log $where", $args);
+					$page_total = $database->get_one("SELECT count(*) FROM score_log $where", $args);
 					// don't cache a length of zero when the extension is first installed
 					if($page_total > 10) {
 						$database->cache->set("event_log_length", 600);
 					}
 				}
 
-				$args[] = $limit;
-				$args[] = $offset;
-				$events = $database->get_all("SELECT * FROM score_log $where ORDER BY id DESC LIMIT ? OFFSET ?", $args);
+				$args["limit"] = $limit;
+				$args["offset"] = $offset;
+				$events = $database->get_all("SELECT * FROM score_log $where ORDER BY id DESC LIMIT :limit OFFSET :offset", $args);
 
 				$this->theme->display_events($events, $page_num, 100);
 			}
@@ -124,8 +120,11 @@ class LogDatabase extends SimpleExtension {
 		if($event->priority >= $config->get_int("log_db_priority")) {
 			$database->execute("
 				INSERT INTO score_log(date_sent, section, priority, username, address, message)
-				VALUES(now(), ?, ?, ?, ?, ?)
-			", array($event->section, $event->priority, $user->name, $_SERVER['REMOTE_ADDR'], $event->message));
+				VALUES(now(), :section, :priority, :username, :address, :message)
+			", array(
+				"section"=>$event->section, "priority"=>$event->priority, "username"=>$user->name,
+				"address"=>$_SERVER['REMOTE_ADDR'], "message"=>$event->message
+			));
 		}
 	}
 }
diff --git a/contrib/notes/main.php b/contrib/notes/main.php
index 92da72fd..4c9dd8c8 100644
--- a/contrib/notes/main.php
+++ b/contrib/notes/main.php
@@ -436,7 +436,7 @@ class Notes extends SimpleExtension {
 			
 		$result = $database->Execute($get_notes, array(1, $pageNumber * $notesPerPage, $notesPerPage));
 		
-		$totalPages = ceil($database->db->GetOne("SELECT COUNT(DISTINCT image_id) FROM notes") / $notesPerPage);
+		$totalPages = ceil($database->get_one("SELECT COUNT(DISTINCT image_id) FROM notes") / $notesPerPage);
 		
 		$images = array();
 		while(!$result->EOF) {
@@ -476,7 +476,7 @@ class Notes extends SimpleExtension {
 			
 		$result = $database->Execute($get_requests, array($pageNumber * $requestsPerPage, $requestsPerPage));
 		
-		$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM note_request") / $requestsPerPage);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_request") / $requestsPerPage);
 		
 		$images = array();
 		while(!$result->EOF) {
@@ -498,7 +498,7 @@ class Notes extends SimpleExtension {
 		
 		$userID = $user->id;
 		
-		$reviewID = $database->db->GetOne("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID));
+		$reviewID = $database->get_one("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID));
 		$reviewID = $reviewID + 1;
 	
 		$database->execute("
@@ -536,7 +536,7 @@ class Notes extends SimpleExtension {
 										"ORDER BY date DESC LIMIT ?, ?",
 										array($pageNumber * $histiriesPerPage, $histiriesPerPage));
 		
-		$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM note_histories") / $histiriesPerPage);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_histories") / $histiriesPerPage);
 		
 		$this->theme->display_histories($histories, $pageNumber + 1, $totalPages);
 	}
@@ -569,7 +569,7 @@ class Notes extends SimpleExtension {
 										"ORDER BY date DESC LIMIT ?, ?",
 										array($noteID, $pageNumber * $histiriesPerPage, $histiriesPerPage));
 					
-		$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID)) / $histiriesPerPage);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID)) / $histiriesPerPage);
 		
 		$this->theme->display_history($histories, $pageNumber + 1, $totalPages);
 	}
diff --git a/contrib/pools/main.php b/contrib/pools/main.php
index 1891788a..3ba90405 100644
--- a/contrib/pools/main.php
+++ b/contrib/pools/main.php
@@ -284,7 +284,7 @@ class Pools extends SimpleExtension {
 				", array($poolsPerPage, $pageNumber * $poolsPerPage)
 				);
 
-		$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM pools") / $poolsPerPage);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM pools") / $poolsPerPage);
 
 		$this->theme->list_pools($page, $pools, $pageNumber + 1, $totalPages);
 	}
@@ -372,7 +372,7 @@ class Pools extends SimpleExtension {
 		}
 
 		if(!strlen($images) == 0) {
-			$count = $database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
+			$count = $database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
 			$this->add_history($poolID, 1, $images, $count);
 		}
 
@@ -418,7 +418,7 @@ class Pools extends SimpleExtension {
 			$images .= " ".$imageID;
 		}
 
-		$count = $database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
+		$count = $database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
 		$this->add_history($poolID, 0, $images, $count);
 		return $poolID;	 
 	}
@@ -430,7 +430,7 @@ class Pools extends SimpleExtension {
 	 */
 	private function check_post($poolID, $imageID) {
 		global $database;
-		$result = $database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=? AND image_id=?", array($poolID, $imageID));
+		$result = $database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=? AND image_id=?", array($poolID, $imageID));
 		return ($result != 0);
 	}
 
@@ -467,7 +467,7 @@ class Pools extends SimpleExtension {
 					LIMIT ? OFFSET ?",
 					array($poolID, $imagesPerPage, $pageNumber * $imagesPerPage));
 
-			$totalPages = ceil($database->db->GetOne("
+			$totalPages = ceil($database->get_one("
 					SELECT COUNT(*) 
 					FROM pool_images AS p
 					INNER JOIN images AS i ON i.id = p.image_id
@@ -482,7 +482,7 @@ class Pools extends SimpleExtension {
 					ORDER BY image_order ASC
 					LIMIT ? OFFSET ?",
 					array($poolID, $imagesPerPage, $pageNumber * $imagesPerPage));
-			$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID)) / $imagesPerPage);
+			$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID)) / $imagesPerPage);
 		}
 
 		$images = array();
@@ -604,7 +604,7 @@ class Pools extends SimpleExtension {
 				LIMIT ? OFFSET ?
 				", array($historiesPerPage, $pageNumber * $historiesPerPage));
 
-		$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM pool_history") / $historiesPerPage);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM pool_history") / $historiesPerPage);
 
 		$this->theme->show_history($history, $pageNumber + 1, $totalPages);
 	}
@@ -645,7 +645,7 @@ class Pools extends SimpleExtension {
 				}
 			}
 
-			$count = $database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
+			$count = $database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
 			$this->add_history($poolID, $newAction, $imageArray, $count);
 		}
 	}
diff --git a/contrib/tag_history/main.php b/contrib/tag_history/main.php
index 07999d93..47f0e19a 100644
--- a/contrib/tag_history/main.php
+++ b/contrib/tag_history/main.php
@@ -213,11 +213,11 @@ class Tag_History implements Extension {
 		
 		// if needed remove oldest one
 		if($allowed == -1) return;
-		$entries = $database->db->GetOne("SELECT COUNT(*) FROM tag_histories WHERE image_id = ?", array($image->id));
+		$entries = $database->get_one("SELECT COUNT(*) FROM tag_histories WHERE image_id = ?", array($image->id));
 		if($entries > $allowed)
 		{
 			// TODO: Make these queries better
-			$min_id = $database->db->GetOne("SELECT MIN(id) FROM tag_histories WHERE image_id = ?", array($image->id));
+			$min_id = $database->get_one("SELECT MIN(id) FROM tag_histories WHERE image_id = ?", array($image->id));
 			$database->execute("DELETE FROM tag_histories WHERE id = ?", array($min_id));
 		}
 	}
diff --git a/contrib/wiki/main.php b/contrib/wiki/main.php
index 2955e4e9..3b66f6bb 100644
--- a/contrib/wiki/main.php
+++ b/contrib/wiki/main.php
@@ -198,7 +198,7 @@ class Wiki extends SimpleExtension {
 	private function get_page($title, $revision=-1) {
 		global $database;
 		// first try and get the actual page
-		$row = $database->db->GetRow("
+		$row = $database->get_row("
 				SELECT *
 				FROM wiki_pages
 				WHERE title LIKE ?
@@ -206,7 +206,7 @@ class Wiki extends SimpleExtension {
 
 		// fall back to wiki:default
 		if(empty($row)) {
-			$row = $database->db->GetRow("
+			$row = $database->get_row("
 					SELECT *
 					FROM wiki_pages
 					WHERE title LIKE ?
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 73d0dfa9..8d6b2af4 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -79,7 +79,7 @@ class Image {
 		assert(is_string($hash));
 		global $database;
 		$image = null;
-		$row = $database->db->GetRow("SELECT images.* FROM images WHERE hash=:hash", array("hash"=>$hash));
+		$row = $database->get_row("SELECT images.* FROM images WHERE hash=:hash", array("hash"=>$hash));
 		return ($row ? new Image($row) : null);
 	}
 
@@ -132,7 +132,7 @@ class Image {
 		assert(is_array($tags));
 		global $database;
 		if(count($tags) == 0) {
-			#return $database->db->GetOne("SELECT COUNT(*) FROM images");
+			#return $database->get_one("SELECT COUNT(*) FROM images");
 			$total = $database->cache->get("image-count");
 			if(!$total) {
 				$total = $database->get_one("SELECT COUNT(*) FROM images");
@@ -190,13 +190,13 @@ class Image {
 		}
 
 		if(count($tags) == 0) {
-			$row = $database->db->GetRow("SELECT images.* FROM images WHERE images.id $gtlt {$this->id} ORDER BY images.id $dir LIMIT 1");
+			$row = $database->get_row("SELECT images.* FROM images WHERE images.id $gtlt {$this->id} ORDER BY images.id $dir LIMIT 1");
 		}
 		else {
 			$tags[] = "id$gtlt{$this->id}";
 			$querylet = Image::build_search_querylet($tags);
 			$querylet->append_sql(" ORDER BY images.id $dir LIMIT 1");
-			$row = $database->db->GetRow($querylet->sql, $querylet->variables);
+			$row = $database->get_row($querylet->sql, $querylet->variables);
 		}
 
 		return ($row ? new Image($row) : null);
@@ -409,7 +409,7 @@ class Image {
 
 		// insert each new tags
 		foreach($tags as $tag) {
-			$id = $database->db->GetOne(
+			$id = $database->get_one(
 					$database->engine->scoreql_to_sql(
 						"SELECT id FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"
 					),
diff --git a/ext/alias_editor/main.php b/ext/alias_editor/main.php
index a61d1275..0c46694b 100644
--- a/ext/alias_editor/main.php
+++ b/ext/alias_editor/main.php
@@ -67,12 +67,12 @@ class AliasEditor extends SimpleExtension {
 
 				$alias_per_page = $config->get_int('alias_items_per_page', 30);
 
-				$query = "SELECT oldtag, newtag FROM aliases ORDER BY newtag ASC LIMIT ? OFFSET ?";
-				$alias = $database->db->GetAssoc($query,
-					array($alias_per_page, $page_number * $alias_per_page)
+				$query = "SELECT oldtag, newtag FROM aliases ORDER BY newtag ASC LIMIT :limit OFFSET :offset";
+				$alias = $database->get_pairs($query,
+					array("limit"=>$alias_per_page, "offset"=>$page_number * $alias_per_page)
 				);
 
-				$total_pages = ceil($database->db->GetOne("SELECT COUNT(*) FROM aliases") / $alias_per_page);
+				$total_pages = ceil($database->get_one("SELECT COUNT(*) FROM aliases") / $alias_per_page);
 
 				$this->theme->display_aliases($page, $alias, $user->is_admin(), $page_number + 1, $total_pages);
 			}
@@ -104,7 +104,7 @@ class AliasEditor extends SimpleExtension {
 	public function onAddAlias(AddAliasEvent $event) {
 		global $database;
 		$pair = array($event->oldtag, $event->newtag);
-		if($database->db->GetRow("SELECT * FROM aliases WHERE oldtag=? AND lower(newtag)=lower(?)", $pair)) {
+		if($database->get_row("SELECT * FROM aliases WHERE oldtag=? AND lower(newtag)=lower(?)", $pair)) {
 			throw new AddAliasException("That alias already exists");
 		}
 		else {
diff --git a/ext/comment/main.php b/ext/comment/main.php
index 9fcbfd4a..5d8c9a63 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -397,7 +397,7 @@ class CommentList extends SimpleExtension {
 
 	private function is_dupe($image_id, $comment) {
 		global $database;
-		return ($database->db->GetRow("SELECT * FROM comments WHERE image_id=? AND comment=?", array($image_id, $comment)));
+		return ($database->get_row("SELECT * FROM comments WHERE image_id=? AND comment=?", array($image_id, $comment)));
 	}
 
 	private function add_comment_wrapper($image_id, $user, $comment, $event) {
diff --git a/ext/image/main.php b/ext/image/main.php
index 5c4cad1d..7815649c 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -234,13 +234,20 @@ class ImageIO extends SimpleExtension {
 		$database->Execute(
 				"INSERT INTO images(
 					owner_id, owner_ip, filename, filesize,
-					hash, ext, width, height, posted, source)
-				VALUES (?, ?, ?, ?, ?, ?, ?, ?, now(), ?)",
-				array($user->id, $_SERVER['REMOTE_ADDR'], $image->filename, $image->filesize,
-						$image->hash, $image->ext, $image->width, $image->height, $image->source));
+					hash, ext, width, height, posted, source
+				)
+				VALUES (
+					:owner_id, :owner_ip, :filename, :filesize,
+					:hash, :ext, :width, :height, now(), :source
+				)",
+				array(
+					"owner_id"=>$user->id, "owner_ip"=>$_SERVER['REMOTE_ADDR'], "filename"=>$image->filename, "filesize"=>$image->filesize,
+					"hash"=>$image->hash, "ext"=>$image->ext, "width"=>$image->width, "height"=>$image->height, "source"=>$image->source
+				)
+		);
 		if($database->engine->name == "pgsql") {
 			$database->Execute("UPDATE users SET image_count = image_count+1 WHERE id = ? ", array($user->id));
-			$image->id = $database->db->GetOne("SELECT id FROM images WHERE hash=?", array($image->hash));
+			$image->id = $database->get_one("SELECT id FROM images WHERE hash=?", array($image->hash));
 		}
 		else {
 			$image->id = $database->db->lastInsertId();
diff --git a/ext/user/main.php b/ext/user/main.php
index 949d3609..d3eca23d 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -286,7 +286,7 @@ class UserPage extends SimpleExtension {
 					"Username contains invalid characters. Allowed characters are ".
 					"letters, numbers, dash, and underscore");
 		}
-		else if($database->db->GetRow("SELECT * FROM users WHERE name = ?", array($name))) {
+		else if($database->get_row("SELECT * FROM users WHERE name = ?", array($name))) {
 			throw new UserCreationException("That username is already taken");
 		}
 	}
@@ -298,7 +298,7 @@ class UserPage extends SimpleExtension {
 		$email = (!empty($event->email)) ? $event->email : null;
 
 		// if there are currently no admins, the new user should be one
-		$need_admin = ($database->db->GetOne("SELECT COUNT(*) FROM users WHERE admin IN ('Y', 't', '1')") == 0);
+		$need_admin = ($database->get_one("SELECT COUNT(*) FROM users WHERE admin IN ('Y', 't', '1')") == 0);
 		$admin = $need_admin ? 'Y' : 'N';
 
 		$database->Execute(
@@ -427,28 +427,28 @@ class UserPage extends SimpleExtension {
 // ips {{{
 	private function count_upload_ips($duser) {
 		global $database;
-		$rows = $database->db->GetAssoc("
+		$rows = $database->get_pairs("
 				SELECT
 					owner_ip,
 					COUNT(images.id) AS count,
 					MAX(posted) AS most_recent
 				FROM images
-				WHERE owner_id=?
+				WHERE owner_id=:id
 				GROUP BY owner_ip
-				ORDER BY most_recent DESC", array($duser->id), false, true);
+				ORDER BY most_recent DESC", array("id"=>$duser->id));
 		return $rows;
 	}
 	private function count_comment_ips($duser) {
 		global $database;
-		$rows = $database->db->GetAssoc("
+		$rows = $database->get_pairs("
 				SELECT
 					owner_ip,
 					COUNT(comments.id) AS count,
 					MAX(posted) AS most_recent
 				FROM comments
-				WHERE owner_id=?
+				WHERE owner_id=:id
 				GROUP BY owner_ip
-				ORDER BY most_recent DESC", array($duser->id), false, true);
+				ORDER BY most_recent DESC", array("id"=>$duser->id));
 		return $rows;
 	}
 // }}}