Fixed issues with DataGroup and other little changes