clean-up
added some todos