Outlier index and a few tweaks