Update on git helpers (sink & ship) and other tweaks