Better output file names + various stuff