Some fixes, files cleanup and new feature: groupfinder