Changed javadoc, fixed minor things.