fixed loads of group comp stuff