[gen] little fixes
[clust] Now works with gen output, removes excess clusters