Upgraded CodeIgniter, and minor tweaks to code along the way