update to use name & difftool
minor cleanups