Adding clustering options, generator tuning, bunch of other options