Few fixes, and gitignore