Making sure the model analysis always returns a 3x3 matrix - some clean ups