added some Javadoc