fixed collateral/matching issues
gitignore changes