Updated .gitignore and small changes