v2-docs and fixes