fixed some minor cleanliness issues
fixed .gitignore conflict