.gitignore and tweaks