Update todo and a few output statements