Numerous changes - lots of JavaDoc, removed some unnecessary NetBeans templates.