more performance indices and other modifications