Render refactor (with couple of fixes)

Why have a `setMatrixData()` at all - why not just add that argument to `setDrawData()`?