More javadoc updates, reverted accidental * import