javadoc updated and generated. Rebuilt .jar with changes. This version is handed in.