fixed .gitignore
fixed various bugs