correcting @todo comments