Some more todo updates, cortesy of acbart