Updated .gitignore
Various fixes