added some more flags to control behavior.
moving names to sample
removing sample names