Incremental building docs, code enhancements