Minor fixes + Multiple correlation