Fixed Group refs, group ids and added missing groups