#132 docs and incorporated some review comments