improve diff output, save notes on void