Better handling of group creations.
Removed useless comments.