Added all the permissions

And other small things