More javadoc, angry NMS fist-shaking