Fix javadocs / comments