Just some housekeeping. I also forgot to mention that there were some bug fixes for main and featureSets in the last commits.