.gitignore
Various fixes