pull from whiteXZ + fix .gitignore