Some fix and gitignore