Added javadoc comments and cleaned up a couple of strings.