documentation update & the related [bug]fixes