Various corrections, cancan working perfectly