Updated TODO with problematic edge case, and tweaked .gitignore.