change to git root working + minor tweaks