Updated various things to make the output more standard.