gitignore and other corrections