removed git dependency, plus fixes