Update doc blocks. Fix typos