More javadoc and comments