updated settings and gitignore
more cleanup and refactoring