More Javadoc and comments