Fix .gitignore and minor changes