fixed some bugs with git controller