Some missing perms sorted and final tidy up