added diff-hl and removed some copy'd comments