gitignore and minor modifications