resolve a few todos