Updated TODO and fixed null file extension issue