specify difftool
some stuff changed and improved, old things cleaned up