Changed formating of files and tweaked timings