api-doc and code comment changes
more code reorg
further reorg
more revision to task merging code