updates & javadoc added