documentation update and bug fix