New gitignore and fixed few bugs