some doc updates and TODOs