docs fixes since the merge