javadoc added & edited