Minor changes

Add a TODO and some comments