Fix standard output and small cosmetic changes to diff logging