More efficient method of parsing filenames
Better documentation
Improved collector checking