added a few todos