Upgrading to latest codeigniter + some minor changes