Save some more metadata
Make the output a lot nicer