added javadoc for milestone 2