gitignore and minor changes