gitignore and fix other