Improved reporting
Correct sample names and sample descriptions too.