template fix and new git option