Fixed bogus reading of GL matrices, replaced with ExposedModel-query
More cleanups
More cleanups