More todo tweaking