Fix next timeout problem. Fix UTF8 encoding in javadoc