add .idea to .gitignore
cherry picked bug fixes from original repo