cleanup
several changes including fixing git's location