almost done fixing git stuff...