Jdoc and bug fix