Fix parser
Fix groups
Fix cluster of size 1
Change name