more CanCan modifications