major TODO-list update