clean up
added missing groups and fixed group ids