Improved Correlation, minor fixes