Fix build, Update doc blocks
Update documentation