Some changes in the TODO-list