more diff tweaks