More fixes, more todos