fixed a few todos / fill me ups