changed remaining --gid to --group and removed remaining places the uid/gid was set