some more filehandling adjustments