git ignore and minor changes