.gitignore updated, settings updated