added some javadocs
javadocs and oh my lord merge conflicts