Minor changes to output format + version