git mostly working
fixes to git