Minor tweaks, adding todos back in