WIP on doc updates for 0.6