Update gitignore and minor tweaks