Datamatrix added. Small fixes.