More stuff for gitignore
bug fix from merge