fixes multi-file parsing; more comprehension