Add calendar admin grp

And various other fixes :)