diff --git a/application/config/config.php b/application/config/config.php
index 38c7091..3f9aea5 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -16,7 +16,7 @@
 */
 
 //Please change to your installation folder, with a trailing / (slash)
-$config['base_url']	= 'http://localhost/';
+$config['base_url']	= 'http://localhost/hunt/Treasure-Hunt/';
 
 /*
 |--------------------------------------------------------------------------
@@ -29,7 +29,7 @@
 |
 */
 // $config['index_page'] = 'index.php';
-$config['index_page'] = '';
+$config['index_page'] = 'index.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -252,11 +252,12 @@
 | 'sess_time_to_update'		= how many seconds between CI refreshing Session Information
 |
 */
+
+$config['sess_driver'] = 'database';
 $config['sess_cookie_name']		= 'ci_session';
 $config['sess_expiration']		= 7200;
 $config['sess_expire_on_close']	= FALSE;
 $config['sess_encrypt_cookie']	= TRUE;
-$config['sess_use_database']	= TRUE;
 $config['sess_table_name']		= 'ci_sessions';
 $config['sess_match_ip']		= TRUE;
 $config['sess_match_useragent']	= TRUE;
diff --git a/application/config/database.php b/application/config/database.php
index 7ad781a..e05bf9d 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -46,19 +46,19 @@
 */
 
 $active_group = 'default';
-$active_record = TRUE;
+$query_builder = TRUE;
 
 //database details - change these to the correct values
 $db['default']['hostname'] = 'localhost';
-$db['default']['username'] = 'root';
-$db['default']['password'] = '';
+$db['default']['username'] = 'treasure_user';
+$db['default']['password'] = 'treasure_password';
 $db['default']['database'] = 'treasurehunt';
 
 
 //standard CI database details
-$db['default']['dbdriver'] = 'mysql';
+$db['default']['dbdriver'] = 'mysqli';
 $db['default']['dbprefix'] = '';
-$db['default']['pconnect'] = TRUE;
+$db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;
 $db['default']['cachedir'] = '';
diff --git a/application/controllers/home.php b/application/controllers/Home.php
similarity index 98%
rename from application/controllers/home.php
rename to application/controllers/Home.php
index 6bd3a2a..35fb514 100644
--- a/application/controllers/home.php
+++ b/application/controllers/Home.php
@@ -101,7 +101,7 @@ public function login() {
 					'role' => $role
 				));
 
-				redirect(base_url(), 'location');
+				redirect(site_url('login'));
 			}else{
 				//0 was returned. could be some error with Facebook API
 				//return to home page, and let the user try logging in again, after logging out
@@ -110,7 +110,7 @@ public function login() {
 		}else{
 			$facebook = $this->facebook->instance->getRedirectLoginHelper();
 			$permissions = ['email'];
-			$loginUrl = $facebook->getLoginUrl(base_url().'login', $permissions);
+			$loginUrl = $facebook->getLoginUrl(site_url('login'), $permissions);
 
 			//redirect to Facebook to authenticate
 			redirect($loginUrl);
diff --git a/application/controllers/nimda.php b/application/controllers/Nimda.php
similarity index 99%
rename from application/controllers/nimda.php
rename to application/controllers/Nimda.php
index 5502722..b24d995 100644
--- a/application/controllers/nimda.php
+++ b/application/controllers/Nimda.php
@@ -1,6 +1,6 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-class nimda extends CI_Controller {
+class Nimda extends CI_Controller {
 
 	function __construct() {
 		parent::__construct();
diff --git a/application/models/admin_model.php b/application/models/Admin_model.php
similarity index 99%
rename from application/models/admin_model.php
rename to application/models/Admin_model.php
index fad7d2d..e59a1d3 100644
--- a/application/models/admin_model.php
+++ b/application/models/Admin_model.php
@@ -1,5 +1,5 @@
 <?php
-class admin_model extends CI_Model {
+class Admin_model extends CI_Model {
 	function get_stats(){
 		//retrieve basic stats
 
diff --git a/application/models/levels_model.php b/application/models/Levels_model.php
similarity index 95%
rename from application/models/levels_model.php
rename to application/models/Levels_model.php
index 631ff51..035393f 100644
--- a/application/models/levels_model.php
+++ b/application/models/Levels_model.php
@@ -1,5 +1,5 @@
 <?php
-class levels_model extends CI_Model {
+class Levels_model extends CI_Model {
 
 	function get_level() {
 		//get level for the current user
@@ -76,8 +76,8 @@ function check_answer($answer){
 			'fb_uid' => $fb_uid,
 			'fb_name' => $fb_name,
 			'level' => $current_level,
-			'answer' => mysql_real_escape_string($answer),
-			'ip' =>  mysql_real_escape_string($_SERVER['REMOTE_ADDR'])
+			'answer' => $this->db->escape($answer),
+			'ip' =>  $this->db->escape($_SERVER['REMOTE_ADDR'])
 		);
 		$this->db->insert('log_answers',$log);
 
diff --git a/application/models/status_model.php b/application/models/Status_model.php
similarity index 98%
rename from application/models/status_model.php
rename to application/models/Status_model.php
index 7d7fe77..0972fbd 100644
--- a/application/models/status_model.php
+++ b/application/models/Status_model.php
@@ -1,5 +1,5 @@
 <?php
-class status_model extends CI_Model {
+class Status_model extends CI_Model {
 
 	function get_leaderboard(){
 		//prepare a leaderboard
diff --git a/application/models/user_model.php b/application/models/User_model.php
similarity index 99%
rename from application/models/user_model.php
rename to application/models/User_model.php
index a9b118e..5d46774 100644
--- a/application/models/user_model.php
+++ b/application/models/User_model.php
@@ -1,5 +1,5 @@
 <?php
-class user_model extends CI_Model {
+class User_model extends CI_Model {
 
 	/*Note:
 		Roles are used to easily separate admins without duplicating code.
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 4aaf4f9..3c6093f 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -93,20 +93,20 @@
 	    <div class="navbar-collapse collapse">
 	      <ul class="nav navbar-nav">
 	      	<?php if($this->session->userdata('is_logged_in')==TRUE) { ?>
-	        <li <?=$active['arena']?>><a href="<?=base_url();?>">Arena</a></li>
+	        <li <?=$active['arena']?>><a href="<?=site_url();?>">Arena</a></li>
 	        <?php } ?>
-	        <li <?=$active['rules']?>><a href="<?=base_url();?>rules">Rules</a></li>
-	        <li <?=$active['leaderboard']?>><a href="<?=base_url();?>leaderboard">Leaderboard</a></li>
-	        <li <?=$active['winners']?>><a href="<?=base_url();?>winners">Winners</a></li>
+	        <li <?=$active['rules']?>><a href="<?=site_url('rules');?>">Rules</a></li>
+	        <li <?=$active['leaderboard']?>><a href="<?=site_url('leaderboard');?>">Leaderboard</a></li>
+	        <li <?=$active['winners']?>><a href="<?=site_url('winners');?>">Winners</a></li>
 
 
 	        <?php if($this->session->userdata('role')>=2) { ?>
 	        <li class="dropdown">
 	          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin Panel <b class="caret"></b></a>
 	          <ul class="dropdown-menu">
-	            <li><a href="<?=base_url();?>nimda">Home</a></li>
-	            <li><a href="<?=base_url();?>nimda/levels">Levels</a></li>
-	            <li><a href="<?=base_url();?>nimda/users">Users</a></li>
+	            <li><a href="<?=site_url('nimda');?>">Home</a></li>
+	            <li><a href="<?=site_url('nimda/levels');?>">Levels</a></li>
+	            <li><a href="<?=site_url('nimda/users');?>">Users</a></li>
 	          </ul>
 	        </li>
 	        <?php } ?>
@@ -115,16 +115,16 @@
 	      </ul>
 	      <ul class="nav navbar-nav navbar-right">
 	      	<?php if($this->session->userdata('is_logged_in')!=TRUE) { ?>
-	        <li><a href="<?=base_url();?>login">Login</a></li>
+	        <li><a href="<?=site_url('login');?>">Login</a></li>
 	        <?php }else { ?>
 	        <li><a href="http://www.facebook.com/clueless.tathva" target="_blank">Clues</a></li>
 	        <li class="dropdown">
 	          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?=$this->session->userdata('fb_name')?> <b class="caret"></b></a>
 	          <ul class="dropdown-menu">
-	            <li><a href="<?=base_url();?>profile">Profile</a></li>
+	            <li><a href="<?=site_url('profile');?>">Profile</a></li>
 	            <li class="divider"></li>
 	            <li class="dropdown-header"><?=$this->session->userdata('fb_name')?></li>
-	            <li><a href="<?=base_url();?>logout">Log-out</a></li>
+	            <li><a href="<?=site_url('logout');?>">Log-out</a></li>
 	          </ul>
 	        </li>
 	        <?php } ?>
diff --git a/application/views/pages/answer.php b/application/views/pages/answer.php
index ab30795..6813949 100644
--- a/application/views/pages/answer.php
+++ b/application/views/pages/answer.php
@@ -7,11 +7,11 @@
 			if($result == true){
 				echo '<h1><span class="text-success">CORRECT</span></h1>';
 				echo '<br><img src="/levels/'.$image.'"/><br><br>';
-				echo '<br><p><a class="btn btn-lg btn-success" href="'.base_url().'">Next Level <i class="glyphicon glyphicon-chevron-right"></i></a></p>';
+				echo '<br><p><a class="btn btn-lg btn-success" href="'.site_url().'">Next Level <i class="glyphicon glyphicon-chevron-right"></i></a></p>';
 				
 			}else{
 				echo '<h1><span class="text-danger">WRONG</span></h1>';
-				echo '<br><p><a class="btn btn-lg btn-danger" href="'.base_url().'">Try Again <i class="glyphicon glyphicon-chevron-left"></i></a></p>';
+				echo '<br><p><a class="btn btn-lg btn-danger" href="'.site_url().'">Try Again <i class="glyphicon glyphicon-chevron-left"></i></a></p>';
 			}
 		?>
 	</div>
diff --git a/application/views/pages/home.php b/application/views/pages/home.php
index 8998b48..0fde737 100644
--- a/application/views/pages/home.php
+++ b/application/views/pages/home.php
@@ -5,7 +5,7 @@
 		<br><br>
 		<p>An exciting online treasure hunt</p>
 		<h3>Start playing, and think harder!</h3>
-		<p><a class="btn btn-primary btn-lg" href="<?=base_url()?>login">Login with Facebook <i class="glyphicon glyphicon-log-in"></i></a></p>
+		<p><a class="btn btn-primary btn-lg" href="<?=site_url('login')?>">Login with Facebook <i class="glyphicon glyphicon-log-in"></i></a></p>
 	</div>
 </div>
 <div class="container">
@@ -13,12 +13,12 @@
 		<div class="col-lg-4">
 			<h2>Leaderboard</h2>
 			<p>Keep track of your competitors.</p>
-			<p><a class="btn btn-default" href="<?=base_url()?>leaderboard">View Leaderboard »</a></p>
+			<p><a class="btn btn-default" href="<?=site_url('leaderboard')?>">View Leaderboard »</a></p>
 		</div>
 		<div class="col-lg-4">
 			<h2>Winners</h2>
 			<p>The determined ones.</p>
-			<p><a class="btn btn-default" href="<?=base_url()?>winners">Winners »</a></p>
+			<p><a class="btn btn-default" href="<?=site_url('winners')?>">Winners »</a></p>
 		</div>
 		<div class="col-lg-4">
 			<h2>Tathva</h2>
diff --git a/application/views/pages/wait.php b/application/views/pages/wait.php
index c653442..358dbc3 100644
--- a/application/views/pages/wait.php
+++ b/application/views/pages/wait.php
@@ -11,12 +11,12 @@
 		<div class="col-lg-4">
 			<h2>Leaderboard</h2>
 			<p>Keep track of your competitors.</p>
-			<p><a class="btn btn-default" href="<?=base_url()?>leaderboard">View Leaderboard »</a></p>
+			<p><a class="btn btn-default" href="<?=site_url('leaderboard')?>">View Leaderboard »</a></p>
 		</div>
 		<div class="col-lg-4">
 			<h2>Winners</h2>
 			<p>The determined ones.</p>
-			<p><a class="btn btn-default" href="<?=base_url()?>winners">Winners »</a></p>
+			<p><a class="btn btn-default" href="<?=site_url('winners')?>">Winners »</a></p>
 		</div>
 		<div class="col-lg-4">
 			<h2>Tathva</h2>
diff --git a/tables.sql b/tables.sql
index 5376e2f..2b112ee 100644
--- a/tables.sql
+++ b/tables.sql
@@ -81,13 +81,13 @@ CREATE TABLE IF NOT EXISTS `users` (
 
 
 CREATE TABLE IF NOT EXISTS `ci_sessions` (
-  `session_id` varchar(40) NOT NULL DEFAULT '0',
+  `id` varchar(40) NOT NULL DEFAULT '0',
   `ip_address` varchar(45) NOT NULL DEFAULT '0',
   `user_agent` varchar(120) NOT NULL,
-  `last_activity` int(10) unsigned NOT NULL DEFAULT '0',
-  `user_data` text NOT NULL,
-  PRIMARY KEY (`session_id`),
-  KEY `last_activity_idx` (`last_activity`)
+  `timestamp` int(10) unsigned NOT NULL DEFAULT 0,
+  `data` blob NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `last_activity_idx` (`timestamp`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;