minor updates of todo