solved a few todos