Some slight todo updates