Fixed Javadoc, did some other commenting too.