Apply gitignore and minor changes