clean of TODOS + some comments