Some improvements with data mode and matrixes.