Add some todos, cleanup