minor changes in TODO comments