updated .gitignore and some cleanup