more changes to add OS name to the output.