UPDATE: Javadoc all over the place