tweaks for git, probelm with timeouts