Update and improve Javadocs