diff --git a/edit-page.php b/edit-page.php
index d1c9bf9..0653133 100644
--- a/edit-page.php
+++ b/edit-page.php
@@ -59,8 +59,6 @@ if( $_POST ) {
 
 adminhead('Edit Page');
 adminmenu('manage-pages.php');
-
-
 ?>
 
 <script language="javascript" type="text/javascript" src="include/tiny_mce/tiny_mce.js"></script>
@@ -80,7 +78,7 @@ tinyMCE.init({
 	theme_advanced_blockformats : "p,h3,h4,h5,h6",
 	theme_advanced_resizing : true,
 	theme_advanced_styles : "Spoiler=spoiler"
-	
+
 });
 </script>
 
diff --git a/edit-rant.php b/edit-rant.php
index 68289a7..f262891 100644
--- a/edit-rant.php
+++ b/edit-rant.php
@@ -118,7 +118,7 @@ if( $_POST ) {
 			foreach($_POST['delete_attachment'] as $attachment)
 				deleteattachment($attachment);
 
-			$existing_attachments = $mtdb->getAll('SELECT ra.id AS id, extension FROM rant_attachment ra JOIN media_t ON ra.media = media_t.id WHERE ra.rant = '.$rant->id.' ORDER BY id');
+			$existing_attachments = $dbConnection->fetchAll('SELECT ra.id AS id, extension FROM rant_attachment ra JOIN media_t ON ra.media = media_t.id WHERE ra.rant = ? ORDER BY id', array($rant->id));
 			for($i = 0; $i < count($existing_attachments); $i++) {
 				$rant->body = preg_replace('/(href|src)=\"([^\"]*?)\\{'.($i+1).'\\}(.*?)\"/', '\1="'.get_rantattachment_filename($existing_attachments[$i]->id).'"', $rant->body);
 			}
@@ -218,7 +218,7 @@ tinyMCE.init({
 <fieldset id="authordiv" class="dbx-box">
 <h3 class="dbx-handle">Author</h3>
 <div class="dbx-content"><select name="rant_author"><?php
-	$contrib = $mtdb->getAll('select id,name from contributor');
+	$contrib = $dbConnection->fetchAll('SELECT id, name FROM contributor');
 	foreach( $contrib as $k=>$v ) {
 		printf('<option value="%s" %s>%s</option>', htmlentities($v->id, ENT_COMPAT, 'UTF-8'), ( $v->id == $rant->author ? 'selected="selected"' : '' ), htmlentities($v->name) );
 	} ?>
@@ -324,7 +324,7 @@ tinyMCE.init({
 		<p>Attach files:</p>
 		<ol id="rant_attachment_list">
 		<?php
-			$attachments = $mtdb->getAll('SELECT ra.id AS id, extension FROM rant_attachment ra JOIN media_t ON ra.media = media_t.id WHERE ra.rant = '.$rant->id.' ORDER BY id');
+			$attachments = $dbConnection->fetchAll('SELECT ra.id AS id, extension FROM rant_attachment ra JOIN media_t ON ra.media = media_t.id WHERE ra.rant = ? ORDER BY id', array($rant->id));
 			foreach($attachments as $k=>$v)
 				printf('<li><input type="checkbox" name="delete_attachment[]" value="%d" /> <a href="%s/%s/%s">%s</a></li>', $v->id, SITE_HOST, SITE_PATH, get_rantattachment_filename($v->id), get_rantattachment_filename($v->id));
 		?>
diff --git a/manage-pages.php b/manage-pages.php
index d3ecebf..3376f33 100644
--- a/manage-pages.php
+++ b/manage-pages.php
@@ -17,10 +17,10 @@ $page = 1;
 if( isset($_GET['page'] )) $page = (int) $_GET['page'];
 
 $perpage = 15;
-$start = ($page-1) * $perpage;
+$start = ($page - 1) * $perpage;
 
-$total = ceil( $mtdb->getOne("SELECT count(DISTINCT url_name) FROM static_page") / $perpage );
-$pages = $mtdb->getAll("SELECT url_name, pubdate, status, title, body FROM static_page ORDER BY url_name ASC LIMIT $start,$perpage");
+$total = ceil( $dbConnection->fetchColumn('SELECT COUNT(url_name) FROM static_page') / $perpage );
+$pages = $dbConnection->fetchAll('SELECT url_name, pubdate, status, title, body FROM static_page ORDER BY url_name ASC LIMIT ?, ?', array($start, $perpage));
 
 pagination( $page, $total );
 
diff --git a/manage-rants.php b/manage-rants.php
index 80edd37..31b74f7 100644
--- a/manage-rants.php
+++ b/manage-rants.php
@@ -17,10 +17,10 @@ $page = 1;
 if( isset($_GET['page'] )) $page = (int) $_GET['page'];
 
 $perpage = 15;
-$start = ($page-1) * $perpage;
+$start = ($page - 1) * $perpage;
 
-$total = ceil( $mtdb->getOne("SELECT count(DISTINCT id) FROM rant") / $perpage );
-$rants = $mtdb->getAll("SELECT r.id,UNIX_TIMESTAMP(r.published) AS published,c.name,r.title,r.body, r.status FROM rant r,contributor c WHERE c.id=r.author GROUP BY id ORDER BY id DESC LIMIT $start,$perpage");
+$total = ceil( $dbConnection->fetchColumn('SELECT COUNT(id) FROM rant') / $perpage );
+$rants = $dbConnection->fetchAll('SELECT r.id, UNIX_TIMESTAMP(r.published) AS published, c.name, r.title, t.body, r.status FROM rant r JOIN contributor c ON r.author = c.id ORDER BY r.id DESC LIMIT ?, ?', array($start, $perpage));
 
 pagination( $page, $total );
 
diff --git a/post-rant.php b/post-rant.php
index 8521116..35d4609 100644
--- a/post-rant.php
+++ b/post-rant.php
@@ -11,7 +11,7 @@ auth_redirect(); // Require logged in user to access this page.
 adminhead('Write Rant');
 adminmenu('post-rant.php');
 
-$rant_image_ext = $mtdb->getOne( 'SELECT extension FROM media_t WHERE id=' . (int)$currentuser->imagetype );
+$rant_image_ext = $dbConnection->fetchColumn('SELECT extension FROM media_t WHERE id = ?', array((int)$currentuser->imagetype));
 
 ?>
 
@@ -58,10 +58,10 @@ tinyMCE.init({
 <div class="dbx-content"><select name="rant_side">
 <?php
   // What side does this author usually post on?
-  $usual = $mtdb->getOne( 'SELECT side,count(*) c FROM rant WHERE author=' . (int)$currentuser->id . ' GROUP BY side ORDER BY c DESC limit 1' );
+  $usual = $dbConnection->fetchColumn('SELECT side, COUNT(*) AS c FROM rant WHERE author = ? GROUP BY side ORDER BY c DESC LIMIT 1', array((int)$currentuser->id));
 
-  $sides = array('left'=>'Left','right'=>'Right');
-  foreach( $sides as $k=>$v ) {
+  $sides = array('left'=>'Left', 'right'=>'Right');
+  foreach( $sides as $k => $v ) {
   	printf('<option value="%s" %s>%s</option>', htmlentities($k), ($usual == $k ? 'selected="selected"' : '' ), $v );
   }
 ?>
@@ -71,8 +71,9 @@ tinyMCE.init({
 <fieldset id="authordiv" class="dbx-box">
 <h3 class="dbx-handle">Author</h3>
 <div class="dbx-content"><select name="rant_author"><?php
-	$contrib = $mtdb->getAll('select id,name from contributor');
-	foreach( $contrib as $k=>$v ) {
+	$contrib = $dbConnection->fetchAll('SELECT id, name FROM contributor');
+	foreach( $contrib as $k => $v )
+	{
 		printf('<option value="%s" %s>%s</option>', htmlentities($v->id), ( $currentuser->id == $v->id ? 'selected="selected"' : '' ), $v->name );
 	} ?>
 </select></div>