gitignore and minor tweaks