some more todos / cleanup