Adapt the model

More comments, more tidy and some test calculations for correlations