updated the way too much javadoc!!!!