continued development

added (for the first time) a lot of JavaDoc commenting. integrated some
like functions with seperations using "int which". organised imports,
and changed some 2.x code to reflect some of the new things in 3.x