Added missing TODO-comments