minor doc change and more TODOs