Fix bug with average and best . And fix Javadoc and public/private method