updated .gitignore, more package fixes