Doc improvement and bug fix