removed some todos from code and fixed .gitignore