Javadoc improvements + minor other cleanup