Add some comments and TODO items