Final updates for genesis/Doc