Merge fix
Easier reading of output file
Remove temp files