Updated filling results and todos