updates, mostly to javadoc