Comments changes for javadocs. Some consolidation to avoid repeating the
same information in the same document. And don't worry, I didn't touch
the funcitonal changes for the machine type.