Optimized sample loading to avoid multiple loading of the same file
Improved responsiveness a bit
Extended samples collection