#155 Added and updated some javadocs.