solved some problems in TODO