updating gitignore, and adding latest changes