more tweaks to work better on git