fixed todo comments