final fixes. Added a todo for TO