Some comment and todos