Correfactor

Major uppdates to correlation analysis.