More comments for Javadocs. Had issues generating them properly from non-lab machines.