Fix javadoc and function count String