Better javadocs around use of data id.
Fixed doc errors.  Thanks to saschoar.