feaw improvments in javadoc and encoding