More .gitignore stuff.
a little refactoring