Updating gitignore and a few misc fixes