aesthetic changes and fix default addGroup value