fix docs, and add r2_