Documentation update and minor bug fix