code fixes for the issues on groups...