A lot of Javadoccing added. Other small changes.