Added Javadoc, slight changes