Git diff and some other tweaks