todo, and fixed some comments