git tunnelling, various cleanups