bug fix, doc updates