Javadoc fixes of some classes. And bug fix of issue #233.