TODO and fixed wrong code comments