fix a few todos