Some fixes
Updated .gitignore