Added bat file to gitignore
Little refactoring and some fix